From 857b22519af1025b450b6d0f3de6d747a073f429 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 7 Feb 2016 07:33:32 -0600 Subject: [PATCH] Remove restricted and multiverse The packages in restricted and multiverse are either non-free or unsupported. While they're usually useful for desktop, they aren't something that OpenStack should grow a dependency on. Also remove non-free and contrib from debian. We don't do anything with debian yet - but if we did, I'm pretty sure we would not want these. Note: The existing restricted and multiverse dirs should be purged, although it's not urgent to do so. 'reprepro --delete clearvanished' Change-Id: I1d98ab1dea52598d01e3ce3d9a24306280a190fe --- modules/openstack_project/files/reprepro/updates | 8 ++++---- .../templates/reprepro/distributions.erb | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/openstack_project/files/reprepro/updates b/modules/openstack_project/files/reprepro/updates index da0a06712c..f1c3414b6f 100644 --- a/modules/openstack_project/files/reprepro/updates +++ b/modules/openstack_project/files/reprepro/updates @@ -1,6 +1,6 @@ Name: ubuntu Method: http://us.archive.ubuntu.com/ubuntu -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Architectures: amd64 GetInRelease: no @@ -8,7 +8,7 @@ VerifyRelease: 437D05B5 Name: ubuntu-security Method: http://security.ubuntu.com/ubuntu -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Architectures: amd64 GetInRelease: no @@ -16,7 +16,7 @@ VerifyRelease: 437D05B5 Name: debian Method: http://ftp.us.debian.org/debian/ -Components: main non-free contrib +Components: main UDebComponents: main Architectures: amd64 GetInRelease: no @@ -24,7 +24,7 @@ VerifyRelease: 2B90D010 Name: debian-security Method: http://security.debian.org/ -Components: main non-free contrib +Components: main UDebComponents: main Architectures: amd64 GetInRelease: no diff --git a/modules/openstack_project/templates/reprepro/distributions.erb b/modules/openstack_project/templates/reprepro/distributions.erb index 49a279a475..aca3cf1b53 100644 --- a/modules/openstack_project/templates/reprepro/distributions.erb +++ b/modules/openstack_project/templates/reprepro/distributions.erb @@ -3,7 +3,7 @@ Origin: Ubuntu Codename: <%= release %> Description: OpenStack Ubuntu <%= release.capitalize %> mirror Architectures: amd64 -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Contents: .gz Update: ubuntu @@ -13,7 +13,7 @@ Origin: Ubuntu Codename: <%= release %>-updates Description: OpenStack Ubuntu <%= release.capitalize %> Updates mirror Architectures: amd64 -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Contents: .gz Update: ubuntu @@ -23,7 +23,7 @@ Origin: Ubuntu Codename: <%= release %>-backports Description: OpenStack Ubuntu <%= release.capitalize %> Backports mirror Architectures: amd64 -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Contents: .gz Update: ubuntu @@ -33,7 +33,7 @@ Origin: Ubuntu Codename: <%= release %>-security Description: OpenStack Ubuntu <%= release.capitalize %> Security mirror Architectures: amd64 -Components: main universe restricted multiverse +Components: main universe UDebComponents: main Contents: .gz Update: ubuntu-security @@ -45,7 +45,7 @@ Origin: Debian Codename: <%= release %> Description: OpenStack Debian <%= release.capitalize %> mirror Architectures: amd64 -Components: main non-free contrib +Components: main UDebComponents: main Contents: .gz Update: debian @@ -55,7 +55,7 @@ Origin: Debian Codename: <%= release %>-updates Description: OpenStack Debian <%= release.capitalize %> Updates mirror Architectures: amd64 -Components: main non-free contrib +Components: main UDebComponents: main Contents: .gz Update: debian