From 91fac8eab81d0ad071130887d72338a82c06a7f4 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 25 Oct 2015 22:10:23 +0900 Subject: [PATCH] Bump UCA & RDO to Liberty GA * Bump from Kilo to Liberty by default for RDO repository, Debian and UCA. * Update GPG KEY files Change-Id: I709ae10101b7156a60efc10e88866abe3e643417 --- files/RPM-GPG-KEY-CentOS-SIG-Cloud | 20 ++++++ files/RPM-GPG-KEY-RDO-Havana | 52 --------------- files/RPM-GPG-KEY-RDO-Juno | 52 --------------- files/RPM-GPG-KEY-RDO-Kilo | 63 ------------------- manifests/repo/debian/params.pp | 2 +- manifests/repo/debian/ubuntu.pp | 2 +- manifests/repo/redhat/params.pp | 2 +- manifests/repo/redhat/redhat.pp | 17 ++--- spec/acceptance/openstack_extras_repo_spec.rb | 2 +- ...penstack_extras_repo_debian_debian_spec.rb | 6 +- ...penstack_extras_repo_debian_ubuntu_spec.rb | 6 +- ...penstack_extras_repo_redhat_redhat_spec.rb | 28 ++++----- 12 files changed, 50 insertions(+), 202 deletions(-) create mode 100644 files/RPM-GPG-KEY-CentOS-SIG-Cloud delete mode 100644 files/RPM-GPG-KEY-RDO-Havana delete mode 100644 files/RPM-GPG-KEY-RDO-Juno delete mode 100644 files/RPM-GPG-KEY-RDO-Kilo diff --git a/files/RPM-GPG-KEY-CentOS-SIG-Cloud b/files/RPM-GPG-KEY-CentOS-SIG-Cloud new file mode 100644 index 0000000..91f8e1c --- /dev/null +++ b/files/RPM-GPG-KEY-CentOS-SIG-Cloud @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQENBFVWcCcBCACfm3eQ0526/I0/p7HpR0NjK7K307XHhnbcbZv1sDUjQABDaqh0 +N4gnZcovf+3fj6pcdOmeOpGI0cKE7Fh68RbEIqyjB7l7+j1grjewR0oCFFZ38KGm +j+DWQrj1IJW7JU5fH/G0Cu66ix+dJPcuTB3PJTqXN3ce+4TuG09D+epgwfbHlqaT +pH2qHCu2uiGj/AaRSM/ZZzcInMaeleHSB+NChvaQ0W/m+kK5d/20d7sfkaTfI/pY +SrodCfVTYxfKAd0TLW03kimHs5/Rdz+iZWecVKv6aFxzaywbrOjmOsy2q0kEWIwX +MTZrq6cBRRuWyiXsI2zT2YHQ4UK44IxINiaJABEBAAG0WkNlbnRPUyBDbG91ZCBT +SUcgKGh0dHA6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv +Q2xvdWQpIDxzZWN1cml0eUBjZW50b3Mub3JnPokBOQQTAQIAIwUCVVZwJwIbAwcL +CQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEPm5/ud2RCnmATUH/3HDtWxpFkmy +FiA3VGkMt5dp3bgCRSd84X6Orfx1LARowpI4LomCGglGBGXVJePBacwcclorbLaz +uWrW/wU0efz0aDB5c4NPg/yXfNvujvlda8ADJwZXVBQphzvaIKwl4PqBsEnxC10I +93T/0iyphAhfMRJ5R8AbEHMj7uF+TWTX/JoyQagllMqWTwoP4DFRutPdOmmjwvSV +kWItH7hq6z9+M4dhlqeoOvPbL5oCxX7TVmLck02Q5gI4syULOa7sqntzUQKFkhWp +9U0+5KrBQBKezrurrrkq/WZR3WNE1KQfNQ77f7S2JcXJdOaKgJ7xe7Y2flPq98Aq +wKXK7l1c3dc= +=W6yF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/files/RPM-GPG-KEY-RDO-Havana b/files/RPM-GPG-KEY-RDO-Havana deleted file mode 100644 index 59a2a5a..0000000 --- a/files/RPM-GPG-KEY-RDO-Havana +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) - -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 -WRhdyg== -=3A9V ------END PGP PUBLIC KEY BLOCK----- diff --git a/files/RPM-GPG-KEY-RDO-Juno b/files/RPM-GPG-KEY-RDO-Juno deleted file mode 100644 index 17970c6..0000000 --- a/files/RPM-GPG-KEY-RDO-Juno +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -tqA= -=vBYB ------END PGP PUBLIC KEY BLOCK----- diff --git a/files/RPM-GPG-KEY-RDO-Kilo b/files/RPM-GPG-KEY-RDO-Kilo deleted file mode 100644 index d204864..0000000 --- a/files/RPM-GPG-KEY-RDO-Kilo +++ /dev/null @@ -1,63 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -MZv87XgaHiLxTrkPCEhOX1U= -=8/+k ------END PGP PUBLIC KEY BLOCK----- diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp index 965b2bc..fe81337 100644 --- a/manifests/repo/debian/params.pp +++ b/manifests/repo/debian/params.pp @@ -4,7 +4,7 @@ # class openstack_extras::repo::debian::params { - $release = 'kilo' + $release = 'liberty' $uca_name = 'ubuntu-cloud-archive' $uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu' diff --git a/manifests/repo/debian/ubuntu.pp b/manifests/repo/debian/ubuntu.pp index 6c240e4..17b5535 100644 --- a/manifests/repo/debian/ubuntu.pp +++ b/manifests/repo/debian/ubuntu.pp @@ -8,7 +8,7 @@ # [*release*] # (optional) The OpenStack release to add an # Ubuntu Cloud Archive APT source for. -# Defaults to 'kilo' +# Defaults to 'liberty' # # [*manage_uca*] # (optional) Whether or not to add the default diff --git a/manifests/repo/redhat/params.pp b/manifests/repo/redhat/params.pp index 6daf529..e450c15 100644 --- a/manifests/repo/redhat/params.pp +++ b/manifests/repo/redhat/params.pp @@ -5,7 +5,7 @@ # class openstack_extras::repo::redhat::params { - $release = 'kilo' + $release = 'liberty' $repo_defaults = { 'enabled' => '1', 'gpgcheck' => '1', diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp index f97d197..99c8fbe 100644 --- a/manifests/repo/redhat/redhat.pp +++ b/manifests/repo/redhat/redhat.pp @@ -78,23 +78,18 @@ class openstack_extras::repo::redhat::redhat( if $manage_rdo { $release_cap = capitalize($release) - # In kilo the URL pattern changed - if $release < 'kilo' { # Lexicographically before 'k' release - $_dist = $::openstack_extras::repo::redhat::params::dist_full - } else { - $_dist = $::openstack_extras::repo::redhat::params::dist_short - } - $rdo_hash = { 'rdo-release' => { - 'baseurl' => "http://repos.fedorapeople.org/repos/openstack/openstack-${release}/${_dist}${::operatingsystemmajrelease}/", + $rdo_hash = { + 'rdo-release' => { + 'baseurl' => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-${release}/", 'descr' => "OpenStack ${release_cap} Repository", 'priority' => $::openstack_extras::repo::redhat::params::rdo_priority, - 'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-${release_cap}", + 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', } } - $rdokey_hash = { "/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-${release_cap}" => { - 'source' => "puppet:///modules/openstack_extras/RPM-GPG-KEY-RDO-${release_cap}" + $rdokey_hash = { '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud' => { + 'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Cloud' } } diff --git a/spec/acceptance/openstack_extras_repo_spec.rb b/spec/acceptance/openstack_extras_repo_spec.rb index 8f5649a..6dab7a9 100644 --- a/spec/acceptance/openstack_extras_repo_spec.rb +++ b/spec/acceptance/openstack_extras_repo_spec.rb @@ -4,7 +4,7 @@ describe 'openstack_extras::repo::*' do context 'default parameters' do - release = 'kilo' + release = 'liberty' it 'should work with no errors' do if fact('operatingsystem') == 'CentOS' operatingsystem = 'redhat' diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb index 3123280..a3d6e3a 100644 --- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb @@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::debian' do let :paramclass_defaults do { - :release => 'kilo' + :release => 'liberty' } end @@ -36,13 +36,13 @@ describe 'openstack_extras::repo::debian::debian' do it { is_expected.to contain_apt__source('debian_wheezy').with( :location => 'http://archive.gplhost.com/debian', - :release => 'kilo', + :release => 'liberty', :repos => 'main', )} it { is_expected.to contain_apt__source('debian_wheezy_backports').with( :location => 'http://archive.gplhost.com/debian', - :release => 'kilo-backports', + :release => 'liberty-backports', :repos => 'main' )} diff --git a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb index 4cefc7a..bf7f6ed 100644 --- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb @@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do let :paramclass_defaults do { - :release => 'kilo' + :release => 'liberty' } end @@ -37,7 +37,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - :release => 'trusty-updates/kilo', + :release => 'trusty-updates/liberty', :repos => 'main', )} @@ -136,7 +136,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - :release => 'trusty-proposed/kilo', + :release => 'trusty-proposed/liberty', :repos => 'main', )} end diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index d8e762b..f6dbecc 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -14,7 +14,7 @@ describe 'openstack_extras::repo::redhat::redhat' do let :paramclass_defaults do { - :release => 'kilo', + :release => 'liberty', :repo_defaults => { 'enabled' => '1', 'gpgcheck' => '1', 'notify' => "Exec[yum_refresh]", @@ -50,10 +50,10 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { is_expected.to contain_yumrepo('rdo-release').with( - :baseurl => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/", - :descr => "OpenStack Kilo Repository", + :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-liberty/", + :descr => "OpenStack Liberty Repository", :priority => 98, - :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo", + :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud", :enabled => '1', :gpgcheck => '1', :mirrorlist => 'absent', @@ -88,8 +88,8 @@ describe 'openstack_extras::repo::redhat::redhat' do )} end - it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo').with( - :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-RDO-Kilo", + it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud').with( + :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Cloud", :owner => 'root', :group => 'root', :mode => '0644', @@ -104,13 +104,13 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { is_expected.to contain_yumrepo('rdo-release').with( - :baseurl => "http://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7/", + :baseurl => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-juno/", :descr => "OpenStack Juno Repository", - :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Juno" + :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud" )} - it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Juno').with( - :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-RDO-Juno" + it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud').with( + :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Cloud" )} end @@ -164,9 +164,9 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { is_expected.to contain_yumrepo('rdo-release').with( - :baseurl => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/", - :descr => "OpenStack Kilo Repository", - :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo", + :baseurl => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-liberty/", + :descr => "OpenStack Liberty Repository", + :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud", :proxy => "http://my.proxy.com:8000" )} end @@ -179,7 +179,7 @@ describe 'openstack_extras::repo::redhat::redhat' do }) end - it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo').with( + it { is_expected.to contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud').with( :owner => "steve" )} end