repo: bump to Kilo by default

* Add RPM-GPG-KEY-RDO-Kilo for RPM repo.
* Default debian, ubuntu and RDO to Kilo release.

Change-Id: Id652c33953f3be1adeee592138fe6d0311d98426

files/RPM-GPG-KEY-RDO-Kilo

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+tqA=
+=vBYB
+-----END PGP PUBLIC KEY BLOCK-----

manifests/repo/debian/debian.pp

@@ -8,7 +8,7 @@
 # [*release*]
 #   (optional) The OpenStack release to add a
 #   Debian Wheezy apt source for.
-#   Defaults to 'icehouse'
+#   Defaults to 'kilo'
 #
 # [*manage_whz*]
 #   (optional) Whether or not to add the default

manifests/repo/debian/params.pp

@@ -4,7 +4,7 @@
 #
 class openstack_extras::repo::debian::params
 {
-  $release               = 'icehouse'
+  $release               = 'kilo'
 
   $uca_name              = 'ubuntu-cloud-archive'
   $uca_location          = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'

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 'icehouse'
+#   Defaults to 'kilo'
 #
 # [*manage_uca*]
 #   (optional) Whether or not to add the default

manifests/repo/redhat/params.pp

@@ -5,7 +5,7 @@
 #
 class openstack_extras::repo::redhat::params
 {
-  $release          = 'juno'
+  $release          = 'kilo'
 
   $repo_defaults    = { 'enabled'    => '1',
                         'gpgcheck'   => '1',

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        => 'icehouse'
+      :release        => 'kilo'
     }
   end
 
@@ -36,14 +36,14 @@ describe 'openstack_extras::repo::debian::debian' do
 
       it { should contain_apt__source('debian_wheezy').with(
         :location           => 'http://archive.gplhost.com/debian',
-        :release            => 'icehouse',
+        :release            => 'kilo',
         :repos              => 'main',
         :required_packages  => 'gplhost-archive-keyring'
       )}
 
       it { should contain_apt__source('debian_wheezy_backports').with(
         :location => 'http://archive.gplhost.com/debian',
-        :release  => 'icehouse-backports',
+        :release  => 'kilo-backports',
         :repos    => 'main'
       )}
 
@@ -114,7 +114,7 @@ describe 'openstack_extras::repo::debian::debian' do
 
       it { should contain_apt__source('debian_wheezy').with(
         :location           => 'http://archive.gplhost.com/debian',
-        :release            => 'icehouse',
+        :release            => 'kilo',
         :repos              => 'main',
         :required_packages  => 'gplhost-archive-keyring',
         :include_src        => 'true'
@@ -122,7 +122,7 @@ describe 'openstack_extras::repo::debian::debian' do
 
       it { should contain_apt__source('debian_wheezy_backports').with(
         :location       => 'http://archive.gplhost.com/debian',
-        :release        => 'icehouse-backports',
+        :release        => 'kilo-backports',
         :repos          => 'main',
         :include_src    => 'true'
       )}

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        => 'icehouse'
+      :release        => 'kilo'
     }
   end
 
@@ -37,7 +37,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :location           => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-        :release            => 'trusty-updates/icehouse',
+        :release            => 'trusty-updates/kilo',
         :repos              => 'main',
         :required_packages  => 'ubuntu-cloud-keyring'
       )}
@@ -104,7 +104,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :include_src        => 'true',
         :location           => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-        :release            => 'trusty-updates/icehouse',
+        :release            => 'trusty-updates/kilo',
         :repos              => 'main',
         :required_packages  => 'ubuntu-cloud-keyring'
       )}

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        => 'icehouse',
+      :release        => 'kilo',
       :repo_defaults  => { 'enabled' => '1',
                            'gpgcheck' => '1',
                            'notify' => "Exec[yum_refresh]",
@@ -38,8 +38,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
-        :operatingsystemrelease => '6.5',
+        :operatingsystemrelease => '7.1',
-        :operatingsystemmajrelease => '6'
+        :operatingsystemmajrelease => '7'
       }
     end
 
@@ -49,10 +49,10 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-6/",
+        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7/",
-        :descr      => "OpenStack Icehouse Repository",
+        :descr      => "OpenStack Kilo Repository",
         :priority   => 98,
-        :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Icehouse",
+        :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo",
         :enabled    => '1',
         :gpgcheck   => '1',
         :mirrorlist => 'absent',
@@ -61,9 +61,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
       )}
 
       it { should contain_yumrepo('epel').with(
-        :baseurl        => 'https://download.fedoraproject.org/pub/epel/6/$basearch',
+        :baseurl        => 'https://download.fedoraproject.org/pub/epel/7/$basearch',
-        :descr          => 'Extra Packages for Enterprise Linux 6 - $basearch',
+        :descr          => 'Extra Packages for Enterprise Linux 7 - $basearch',
-        :gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6",
+        :gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7",
         :failovermethod => 'priority',
         :enabled        => '1',
         :gpgcheck       => '1',
@@ -72,8 +72,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :notify         => "Exec[yum_refresh]"
       )}
 
-      it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Icehouse').with(
+      it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo').with(
-        :source     => "puppet:///modules/openstack_extras/RPM-GPG-KEY-RDO-Icehouse",
+        :source     => "puppet:///modules/openstack_extras/RPM-GPG-KEY-RDO-Kilo",
         :owner      => 'root',
         :group      => 'root',
         :mode       => '0644',
@@ -88,7 +88,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-6/",
+        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7/",
         :descr      => "OpenStack Juno Repository",
         :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Juno"
       )}
@@ -148,9 +148,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-6/",
+        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7/",
-        :descr      => "OpenStack Icehouse Repository",
+        :descr      => "OpenStack Kilo Repository",
-        :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Icehouse",
+        :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo",
         :proxy     => "http://my.proxy.com:8000"
       )}
     end
@@ -163,7 +163,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
                               })
       end
 
-      it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Icehouse').with(
+      it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo').with(
         :owner => "steve"
       )}
     end