Update puppet-openstack to their latest masters.

Update aodh to af979699b89161fa7b7a232fd6820d425dc10975 af979699b89161fa7b7a232fd6820d425dc10975 Merge "Update tests to leverage rspec-puppet-facts" 277cf7ae23e9373ec3f3988556746723f244d911 Use openstack spec helper for spec defaults a6e6657811f52ce35c6af69b1cba3f0a376285c4 Update tests to leverage rspec-puppet-facts fc8fc7fd2620fe58ad2b563447ebd8e9415f202c Merge "Add rspec-puppet-facts to the spec_helper" 1ab9af70841d9d7ed712701477329c439804ab17 Merge "Update typo" a446693bae2dc8b9f309fc6cc37b3766993a0d9b Add rspec-puppet-facts to the spec_helper 292483b566494f1870f1d9fcafd5e242b7912108 Update typo Change-Id: I48d708c2a6a864c3dd5c048cd0d351407cb547f3 Update ceilometer to 6941231059b868e32db72e640d04dcd3b8183f96 6941231059b868e32db72e640d04dcd3b8183f96 Move workers options into specific sections. f6e0e94acf5ca8b578120b1008e0913cd2634968 Merge "Improve format of the documentations." 27654f3e170a0d20199e6f125796086cd2cad643 Improve format of the documentations. Change-Id: I37b5f38d0d1b6d5b873cba6a8dd60e48d3698334 Update cinder to 296dbfd5141125a0a34ed2e6997a9fd08f5b0780 296dbfd5141125a0a34ed2e6997a9fd08f5b0780 Merge "Fix wrong location for lock_path of params" 223614fa5005717e79d48a93903418246dc005e7 Merge "Add rspec-puppet-facts to the spec_helper" 7469d8fc1ccfefb1f2dd0610799fb4729636ceb3 Fix wrong location for lock_path of params c90c34be30582ee1930752b787bf2fb6000cd0a2 Merge "Remove outdated scheduler_driver from documentation" a81ccddfe4c1af29082136d2c666e5ac1bac7fa6 Remove outdated scheduler_driver from documentation b8967f3ec4385dd4a2cf9dddc953bd48a1690e45 Add rspec-puppet-facts to the spec_helper Change-Id: I75cdc8d1606773f593fa3501b05f7f36b86a5ed8 Update glance to 1f8cacb7367e756966c377953abdcd557da97d7d 1f8cacb7367e756966c377953abdcd557da97d7d Merge "Add memcached_servers parameter" f444097a7177bf1a2f6329444202b03b9bfd7042 Add memcached_servers parameter e58c73f9c6e3ec53961690df90f3d207d73c1e48 Merge "Update to pull in rspec-puppet-facts" a3bccf6363e493bd11bf5dc7ae7e0da0fd985daf Merge "Create glance::cache::logging class" 72fbeed3dce4c16bb5214e68445ca26ee3d4100d Create glance::cache::logging class c9f7cbc8b59f460691317378fc429b79527c3d6c Update to pull in rspec-puppet-facts Change-Id: I7bd8753c97db7fe98c5cff51c87390dba1c79411 Update gnocchi to b764d19d488825752e8f335dd3c132ed71170de1 b764d19d488825752e8f335dd3c132ed71170de1 Merge "Update typo" 7e5456139880389a52fc4b383f23eabdfe5e5ee0 Add missing metricd service ca64b935079bf51a68d90eb6734916dd73a32fa4 Update typo Change-Id: I77a10a8c30ab4d082430695f2ee140a2c79249cb Update heat to ae2e7760b313d32d77ca47bd731e4af4676278a5 ae2e7760b313d32d77ca47bd731e4af4676278a5 Add rspec-puppet-facts to the spec_helper Change-Id: Ic8e131a2868ca747bbbb81b3072dadc1c112ccfa Update horizon to 20390eaae31af006479f14dccb794b6111b1d28c 20390eaae31af006479f14dccb794b6111b1d28c Add List/None type value in the local_settings. Change-Id: Ia13c95f66616f26bbf600c078ba734c23099abda Update ironic to e5022881763d1bbb8ee7997e22771b3293bd06a3 e5022881763d1bbb8ee7997e22771b3293bd06a3 Add rspec-puppet-facts to the spec_helper Change-Id: Ic9525c3cf9e80925ee45530c707abcddd911e652 Update keystone to cfa106045fe5e763ef315047907fbfb1ffdabb54 cfa106045fe5e763ef315047907fbfb1ffdabb54 Merge "Testing some keystone types alone fails" e7ea5ee853d24cab966008b5b92115fc53cbe6f9 Merge "Refactor of domain_name_from_id" e2792e6b57a42a947fd67f3cf2841a812631041f Testing some keystone types alone fails ec9d29bf7b3bfd69f79c9cdbd73af0052aa4753d Add rspec-puppet-facts to the spec_helper ae556eec8fc44146c8b9492da1e10540c516f19e Refactor of domain_name_from_id 4d1fd0ea3b2a29fec79230a927d4c1d789bbf6b4 Use recommended abbreviation of the classes Change-Id: Id0aa37fe97dbc261f443996ddc9d1f56fd3247a5 Update neutron to ec80ab909fbc2ac36f8425b11f4365c2a32b6ecd ec80ab909fbc2ac36f8425b11f4365c2a32b6ecd Merge "LBaaSv2 support" 0e5c4b2e41b53417e44b0b635109cdaeacedf2a4 Merge "Add related parameters to ovs section" 567d41a349ac68196dc04ff25585b778c87fb00b LBaaSv2 support fcb6f96ecb9e8b58de296ed4251666011a0a94a0 Add related parameters to ovs section 1d354007becf3f3c8ead7828b5e394774e44f168 Do not manage network, subnet, router resources if prefetch fails 023292b59c144d60745cbbb3810127b158c1bdf5 Rename admin_state_up method to avoid conflict with accessor Change-Id: Ifab3a3ea305e2edc62c9362ea9e9ba94b446344b Update nova to 32fb6134c0e8c663959e474d3e41f318689b1597 32fb6134c0e8c663959e474d3e41f318689b1597 Add ensure_package for nova libvirt package fb7baa6b98e6b1402589ae9d44a950485f83f47b Merge "Fix bug for deprecated vnc options." 93edb8b19910a89151fad4fa93ce124f124f20b3 Merge "Change SSL options to [ssl] section." f208f5c9534bdf1c8e0b58ef1add69619144a221 Merge "Add rspec-puppet-facts to the spec_helper" bc17d4cd74d32ee8dd24c62ce2e6679f8a9c98f7 Fix bug for deprecated vnc options. fdf5875be4e08e8f28fd0d75d1fe5ba32f242050 Change SSL options to [ssl] section. cdfddf82bc06773347b3e9df922750a20d66e13c Add rspec-puppet-facts to the spec_helper Change-Id: Id6dccbf8d9fd1447f14c72e74f7ee10f1b6e9511 Update trove to 5002dfad3c545753f4faf1ff30ed366db58526d0 5002dfad3c545753f4faf1ff30ed366db58526d0 Merge "Introduce amqp_durable_queues option" 75192f5327b0c92cc9c5be11cdd3d28d0a51aff5 Merge "Add rabbit_ha_queues option" d91b9599b41e7951a30385054a23721d0ed2ebc1 Introduce amqp_durable_queues option 2443294da20b9f59ce5001b957a4bffe0798b340 Add rabbit_ha_queues option Change-Id: Ifc1ebfea560310d502c0624af9e712e583b8b61d Update openstacklib to 3dcf1cb6c5cf37cb2034f6ad3e038352871a2434 3dcf1cb6c5cf37cb2034f6ad3e038352871a2434 Merge "Add rspec-puppet-facts to the spec_helper" b04e0dbd6e1c18d5a310eabb3c1a57b81dc05651 Add rspec-puppet-facts to the spec_helper 3e43f5ddcf7962eeef67123f423e76dfe311e18c openstackconfig idempotency fix Change-Id: I1dc30ff3d443d45345ac99740a8dedcae003cf4d Update openstack_extras to 32afcf4af819aba1b9f8d94822dfb84152a0410b 32afcf4af819aba1b9f8d94822dfb84152a0410b Add rspec-puppet-facts to the spec_helper 9823bd1d51c0d188e41fc02c1862c8a22dcb408d Add os_service_default fact for tests Change-Id: Ib0b02467d8dd26ed8aa47ff7497690bd1ac77227
redhat-openstack · Jan 15, 2016 · c11eaf1 · c11eaf1
1 parent 2562146
commit c11eaf1
Show file tree

Hide file tree

Showing 115 changed files with 2,108 additions and 918 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -1,5 +1,5 @@
 mod 'aodh',
-  :commit => 'd7ca4c17bef7e2808b4e78bf4b6eb7eb24f34807',
+  :commit => 'af979699b89161fa7b7a232fd6820d425dc10975',
   :git => 'https://github.com/openstack/puppet-aodh.git'
 
 mod 'apache',
@@ -15,7 +15,7 @@ mod 'cassandra',
   :git => 'https://github.com/locp/cassandra.git'
 
 mod 'ceilometer',
-  :commit => 'ab503a9e910f946bb02cc557c68364769a9cc4a2',
+  :commit => '6941231059b868e32db72e640d04dcd3b8183f96',
   :git => 'https://github.com/openstack/puppet-ceilometer.git'
 
 mod 'ceph',
@@ -27,7 +27,7 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => 'f6a643c7ebe67ffd1cb087686533c55d17c8c04f',
+  :commit => '296dbfd5141125a0a34ed2e6997a9fd08f5b0780',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -71,27 +71,27 @@ mod 'git',
   :git => 'https://github.com/puppetlabs/puppetlabs-git.git'
 
 mod 'glance',
-  :commit => '429c256ebc4ba916ae42dae6454e591503515614',
+  :commit => '1f8cacb7367e756966c377953abdcd557da97d7d',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
   :commit => '23b1055314bb435b4725134a9055c8676ccdfcff',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => 'ee1caa5ad9cf7d6fbdc9dc049e195545e2e9b0a3',
+  :commit => 'b764d19d488825752e8f335dd3c132ed71170de1',
   :git => 'https://github.com/openstack/puppet-gnocchi.git'
 
 mod 'haproxy',
   :commit => '8b7f2765f18222821d6ec2967e088522e4d64197',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => 'b898edf90ae5814f32e6303b733468673970ddfd',
+  :commit => 'ae2e7760b313d32d77ca47bd731e4af4676278a5',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '1a52b5bb0d92becfbf87158c830f2327b6a6c4e6',
+  :commit => '20390eaae31af006479f14dccb794b6111b1d28c',
   :git => 'https://github.com/openstack/puppet-horizon.git'
 
 mod 'inifile',
@@ -103,7 +103,7 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => 'fc36b718f928f497f2639efd459fe35834827063',
+  :commit => 'e5022881763d1bbb8ee7997e22771b3293bd06a3',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'java',
@@ -119,7 +119,7 @@ mod 'keepalived',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => '42d05b200514fa034ea53175f1f34323f406898c',
+  :commit => 'cfa106045fe5e763ef315047907fbfb1ffdabb54',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'kibana3',
@@ -163,11 +163,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '41a048002521b65d774185c2ee93f2f38e4a2e17',
+  :commit => 'ec80ab909fbc2ac36f8425b11f4365c2a32b6ecd',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '4a9ba6ac295a6394ccc63e8017a22623ef2533ac',
+  :commit => '32fb6134c0e8c663959e474d3e41f318689b1597',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
@@ -183,11 +183,11 @@ mod 'opendaylight',
   :git => 'https://github.com/dfarrell07/puppet-opendaylight.git'
 
 mod 'openstack_extras',
-  :commit => '9bdabc182d54071973cc1dbdc71cb022e7ed7cd2',
+  :commit => '32afcf4af819aba1b9f8d94822dfb84152a0410b',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => 'b3f0b0a810bdcab2cc5e8a5bc07f6974265f8238',
+  :commit => '3dcf1cb6c5cf37cb2034f6ad3e038352871a2434',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
@@ -267,7 +267,7 @@ mod 'tripleo',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '29ffe75672c0f7e3a13741084ffd88ff13546e55',
+  :commit => '5002dfad3c545753f4faf1ff30ed366db58526d0',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',

diff --git a/aodh/Gemfile b/aodh/Gemfile
@@ -3,6 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 group :development, :test do
   gem 'puppetlabs_spec_helper',               :require => 'false'
   gem 'rspec-puppet', '~> 2.2.0',             :require => 'false'
+  gem 'rspec-puppet-facts',                   :require => 'false'
   gem 'metadata-json-lint',                   :require => 'false'
   gem 'puppet-lint-param-docs',               :require => 'false'
   gem 'puppet-lint-absolute_classname-check', :require => 'false'
@@ -14,6 +15,9 @@ group :development, :test do
   gem 'puppet-lint-numericvariable',          :require => 'false'
   gem 'json',                                 :require => 'false'
   gem 'webmock',                              :require => 'false'
+  gem 'puppet-openstack_spec_helper',
+      :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+      :require => false
 end
 
 group :system_tests do

diff --git a/aodh/manifests/db/mysql.pp b/aodh/manifests/db/mysql.pp
@@ -1,7 +1,7 @@
 # The aodh::db::mysql class implements mysql backend for aodh
 #
 # This class can be used to create tables, users and grant
-# privelege for a mysql aodh database.
+# privileges for a mysql aodh database.
 #
 # == parameters
 #

diff --git a/aodh/spec/classes/aodh_api_spec.rb b/aodh/spec/classes/aodh_api_spec.rb
@@ -119,89 +119,44 @@ class { 'aodh': }"
 
       it_raises 'a Puppet::Error', /Invalid service_name/
     end
-  end
-
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '8.0',
-        :concat_basedir         => '/var/lib/puppet/concat',
-        :fqdn                   => 'some.host.tld',
-        :processorcount         => 2,
-      })
-    end
-
-    let :platform_params do
-      { :api_package_name => 'aodh-api',
-        :api_service_name => 'aodh-api' }
-    end
-
-    it_configures 'aodh-api'
-  end
 
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7.1',
-        :fqdn                   => 'some.host.tld',
-        :concat_basedir         => '/var/lib/puppet/concat',
-        :processorcount         => 2,
-      })
-    end
-
-    let :platform_params do
-      { :api_package_name => 'openstack-aodh-api',
-        :api_service_name => 'openstack-aodh-api' }
-    end
-
-    it_configures 'aodh-api'
-  end
-
-  describe 'with custom auth_uri' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-    before do
-      params.merge!({
-        :keystone_auth_uri => 'https://foo.bar:1234/',
-      })
-    end
-    it 'should configure custom auth_uri correctly' do
-      is_expected.to contain_aodh_config('keystone_authtoken/auth_uri').with_value( 'https://foo.bar:1234/' )
+    context "with custom keystone identity_uri and auth_uri" do
+      before do
+        params.merge!({
+          :keystone_identity_uri => 'https://foo.bar:35357/',
+          :keystone_auth_uri => 'https://foo.bar:5000/v2.0/',
+        })
+      end
+      it 'configures identity_uri and auth_uri but deprecates old auth settings' do
+        is_expected.to contain_aodh_config('keystone_authtoken/identity_uri').with_value("https://foo.bar:35357/");
+        is_expected.to contain_aodh_config('keystone_authtoken/auth_uri').with_value("https://foo.bar:5000/v2.0/");
+      end
     end
   end
 
-  describe "with custom keystone identity_uri" do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-    before do
-      params.merge!({
-        :keystone_identity_uri => 'https://foo.bar:1234/',
-      })
-    end
-    it 'configures identity_uri' do
-      is_expected.to contain_aodh_config('keystone_authtoken/identity_uri').with_value("https://foo.bar:1234/");
-    end
-  end
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({
+          :fqdn           => 'some.host.tld',
+          :processorcount => 2,
+          :concat_basedir => '/var/lib/puppet/concat'
+        }))
+      end
 
-  describe "with custom keystone identity_uri and auth_uri" do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-    before do
-      params.merge!({
-        :keystone_identity_uri => 'https://foo.bar:35357/',
-        :keystone_auth_uri => 'https://foo.bar:5000/v2.0/',
-      })
-    end
-    it 'configures identity_uri and auth_uri but deprecates old auth settings' do
-      is_expected.to contain_aodh_config('keystone_authtoken/identity_uri').with_value("https://foo.bar:35357/");
-      is_expected.to contain_aodh_config('keystone_authtoken/auth_uri').with_value("https://foo.bar:5000/v2.0/");
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          { :api_package_name => 'aodh-api',
+            :api_service_name => 'aodh-api' }
+        when 'RedHat'
+          { :api_package_name => 'openstack-aodh-api',
+            :api_service_name => 'openstack-aodh-api' }
+        end
+      end
+      it_configures 'aodh-api'
     end
   end
 

diff --git a/aodh/spec/classes/aodh_auth_spec.rb b/aodh/spec/classes/aodh_auth_spec.rb
@@ -36,20 +36,16 @@
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
-    end
-
-    it_configures 'aodh-auth'
-  end
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
 
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
+      it_configures 'aodh-auth'
     end
-
-    it_configures 'aodh-auth'
   end
 
 end
diff --git a/aodh/spec/classes/aodh_client_spec.rb b/aodh/spec/classes/aodh_client_spec.rb
@@ -15,19 +15,16 @@
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_configures 'aodh client'
     end
-
-    it_configures 'aodh client'
   end
 
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
-    end
-
-    it_configures 'aodh client'
-  end
 end
diff --git a/aodh/spec/classes/aodh_db_postgresql_spec.rb b/aodh/spec/classes/aodh_db_postgresql_spec.rb
@@ -10,15 +10,7 @@
     'include postgresql::server'
   end
 
-  context 'on a RedHat osfamily' do
-    let :facts do
-      {
-        :osfamily                 => 'RedHat',
-        :operatingsystemrelease   => '7.0',
-        :concat_basedir => '/var/lib/puppet/concat'
-      }
-    end
-
+  shared_examples 'aodh::db::postgresql' do
     context 'with only required parameters' do
       let :params do
         req_params
@@ -32,27 +24,19 @@
 
   end
 
-  context 'on a Debian osfamily' do
-    let :facts do
-      {
-        :operatingsystemrelease => '7.8',
-        :operatingsystem        => 'Debian',
-        :osfamily               => 'Debian',
-        :concat_basedir => '/var/lib/puppet/concat'
-      }
-    end
-
-    context 'with only required parameters' do
-      let :params do
-        req_params
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({
+          :concat_basedir => '/var/lib/puppet/concat'
+        }))
       end
 
-      it { is_expected.to contain_postgresql__server__db('aodh').with(
-        :user     => 'aodh',
-        :password => 'md534e5dd092d680f3d8c11c62951fb5c19'
-      )}
+      it_configures 'aodh::db::postgresql'
     end
-
   end
 
+
 end