Merge pull request #150 from xbezdick/juno

Update openstack modules to stable/juno
redhat-openstack · Nov 25, 2014 · 354e31f · 354e31f
2 parents 3a5bd6d + 3873be9
commit 354e31f
Show file tree

Hide file tree

Showing 40 changed files with 535 additions and 264 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -3,15 +3,15 @@ mod 'apache',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'ceilometer',
-  :commit => '1d78470e5023e2ca6adef47c904d14d046dd87d1',
+  :commit => '741e89ae5b59e6284d677dd1c3cdf4154902a378',
   :git => 'https://github.com/stackforge/puppet-ceilometer.git'
 
 mod 'certmonger',
   :commit => '3f86b9973fc30c14a066b0f215023d5f1398b874',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => 'b5dce39754ed6857d6dc87b3ae29ed38057a487e',
+  :commit => '1ee8a6cab39da6beebf7a0b39207f0002368196f',
   :git => 'https://github.com/stackforge/puppet-cinder.git'
 
 mod 'common',
@@ -31,7 +31,7 @@ mod 'galera',
   :git => 'https://github.com/rohara/puppet-galera.git'
 
 mod 'glance',
-  :commit => '916a90ebdc3e9fafe956b12dcaa0e0ce3e7e3f04',
+  :commit => 'a243f89a52f7dd2dc16b36d1c9b79ec1616c6596',
   :git => 'https://github.com/stackforge/puppet-glance.git'
 
 mod 'gluster',
@@ -43,11 +43,11 @@ mod 'haproxy',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '45a35dc2ec5f01bd79189ada881d083e1a51413b',
+  :commit => 'b1e9e9bd48c3da15be69c0797fb05e7ce0f6698f',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '351c711004ccd9815e9a0d153bc5452461f7852d',
+  :commit => '353c372d582167d5635b1b2ee9474cf6822db032',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',
@@ -87,11 +87,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '663b4b16d22f78dbbb89c58170690a3c0a1e0ff2',
+  :commit => '67abde86d53969329bce37725627c2c661e49765',
   :git => 'https://github.com/stackforge/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '261ae911fc5c325f6dd739a9b05f508a80a25034',
+  :commit => '181991927131206d4ea59a679e8108e36dc86c77',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
@@ -107,7 +107,7 @@ mod 'openstack',
   :git => 'https://github.com/stackforge/puppet-openstack.git'
 
 mod 'openstacklib',
-  :commit => '2fc2e5504de7c298263a1d63af92974a7779d5c9',
+  :commit => 'e64e9c2a44833b25b602138b53a3187db49eaef8',
   :git => 'https://github.com/stackforge/puppet-openstacklib.git'
 
 mod 'pacemaker',
@@ -151,7 +151,7 @@ mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '2193831dd787e9b24382c588dfa49917bcf47262',
+  :commit => '68a9e8eecba4a280ea1ec18fba67069a8c7dfce4',
   :git => 'https://github.com/stackforge/puppet-swift.git'
 
 mod 'sysctl',

diff --git a/ceilometer/README.md b/ceilometer/README.md
@@ -1,7 +1,7 @@
 Ceilometer
 ==========
 
-4.0.0 - 2014.1.0 - Icehouse
+5.0.0 - 2014.2.0 - Juno
 
 #### Table of Contents
 
@@ -72,6 +72,37 @@ This is the ceilometer module.
 Release Notes
 -------------
 
+** 5.0.0 **
+* Stable Juno release
+* Added package_ensure parameters to various classes to control package installation
+* Added ceilometer::policy to control policy.json
+* Updated validate_re expressions for Puppet 3.7
+* Bumped stdlib dependency to >=4.0.0
+* Added manage_service parameters to various classes to control whether the service was managed, as well as added enabled parameters where not already present
+* Added parameters to control whether to configure keystone users
+* Added the ability to override the keystone service name in ceilometer::keystone::auth
+* Migrated the ceilometer::db::mysql class to use openstacklib::db::mysql and deprecated the mysql_module parameter
+* Fixed ceilometer-notification package name for RHEL
+* Removed deprecation notices for sectionless ceilometer_config types for Juno release
+* Added ability to hide secrets from puppet logs
+
+** 4.2.0 **
+
+* Fixed dependency on nova-common package
+* Added new class for extended logging options
+* Fixed ssl parameter requirements for kombu and rabbit
+* Fixed mysql_grant call
+* Fixed ceilometer-collecter service relationships when service is disabled
+
+
+** 4.1.0 **
+
+* Added RabbitMQ SSL Support.
+* Fixed dependency cycle bug.
+* Fixed agent_notification_service_name.
+* Changed default mysql charset to UTF8.
+* Pinned major gems.
+
 ** 4.0.0 **
 
 * Stable Icehouse release.
@@ -80,7 +111,6 @@ Release Notes
 * Fixed region name configuration.
 * Fixed ensure packages bug.
 * Added support for puppetlabs-mysql 2.2 and greater.
-* Fixed MySQL grant call.
 * Introduced ceilometer::config to handle additional custom options.
 
 ** 3.1.1 **
@@ -126,3 +156,4 @@ Contact
 -------
 
 [email protected]
+Ceilometer
diff --git a/cinder/README.md b/cinder/README.md
@@ -1,7 +1,7 @@
 cinder
 =======
 
-4.0.0 - 2014.1.0 - Icehouse
+5.0.0 - 2014.2.0 - Juno
 
 #### Table of Contents
 
@@ -178,6 +178,41 @@ Contributors
 Release Notes
 -------------
 
+**5.0.0**
+
+* Stable Juno release
+* Added class to manage policy.json
+* Changed the default value of the san_thin_provision parameter for eqlx
+* Added database tuning parameters
+* Made keystone user creation optional when creating a service
+* Added ability to hide secrets from logs
+* Added parameters for netapp and and cinder-api workers
+* Corrected the package name for cinder backup
+* Added support for the EMC VNX direct driver
+* Migrated the mysql backend to use openstacklib::db::mysql
+* Added support for availability zones
+
+**4.2.0**
+
+* Added parameters to set cinder volume driver
+* Added class for extended logging options
+* Added option to specify endpoint protocol
+* Fixed cinder type path issues
+* Added option to specify cinder volume path
+* Fixed targetcli package dependency on target service
+* Fixed os version fact comparison for RedHat-based operating systems
+  for specifying service provider
+* Added option to configure os_region_name in the cinder config
+
+**4.1.0**
+
+* Added Cinder v2 endpoint support.
+* Added SSL support for Cinder API.
+* Added RabbitMQ SSL support.
+* Moved default_volume_type to cinder::api
+* Removed warnings for existing Cinder volumes.
+* Pinned major gems.
+
 **4.0.0**
 
 * Stable Icehouse release.

diff --git a/glance/README.md b/glance/README.md
@@ -1,7 +1,7 @@
 glance
 =======
 
-4.0.0 - 2014.1.0 - Icehouse
+5.0.0 - 2014.2.0 - Juno
 
 #### Table of Contents
 
@@ -133,6 +133,38 @@ Contributors
 Release Notes
 -------------
 
+**5.0.0**
+
+* Stable Juno release
+* Added ceilometer::policy to control policy.json
+* Fixed bug in glance_image type
+* Added parameter os_region_name to glance::api
+* Added support for vSphere datastore backend
+* Updated the calls to the glance command-line utility
+* Added parameter swift_store_large_object_size to glance::backend::swift
+* Bumped stdlib dependency to >=4.0.0
+* Added parameter command_options to glance::cache::cleaner and glance::cache::pruner
+* Added parameter package_ensure to glance::backend::rbd
+* Added parameter manage_service to various classes
+* Added parameters to control whether to configure users
+* Migrated the glance::db::mysql class to use openstacklib::db::mysql and deprecated the mysql_module parameter
+* Added parameter registery_client_protocol to glance::api
+* Fixed ssl parameter requirements for kombu and rabbit
+
+**4.2.0**
+
+* Added ability to hide secret type parameters from logs
+
+**4.1.0**
+
+* Added multiple rabbit hosts support.
+* Added image_cache_dir parameter.
+* Deprecated old SQL parameters.
+* Fixed the Glance add_image parser for new client.
+* Fixed values in get_glance_image_attrs.
+* Fixed 'could not find user glance' bug.
+* Pinned major gems.
+
 **4.0.0**
 
 * Stable Icehouse release.

diff --git a/glance/manifests/api.pp b/glance/manifests/api.pp
@@ -290,11 +290,11 @@
   # known_stores config
   if $known_stores {
     glance_api_config {
-      'DEFAULT/known_stores':  value => join($known_stores, ',');
+      'glance_store/stores':  value => join($known_stores, ',');
     }
   } else {
     glance_api_config {
-      'DEFAULT/known_stores': ensure => absent;
+      'glance_store/stores': ensure => absent;
     }
   }
 

diff --git a/glance/manifests/backend/cinder.pp b/glance/manifests/backend/cinder.pp
@@ -71,7 +71,7 @@
     'DEFAULT/cinder_api_insecure':         value => $cinder_api_insecure;
     'DEFAULT/cinder_catalog_info':         value => $cinder_catalog_info;
     'DEFAULT/cinder_http_retries':         value => $cinder_http_retries;
-    'DEFAULT/default_store':               value => 'cinder';
+    'glance_store/default_store':          value => 'cinder';
   }
 
   glance_cache_config {

diff --git a/glance/manifests/backend/file.pp b/glance/manifests/backend/file.pp
@@ -9,11 +9,11 @@
 ) inherits glance::api {
 
   glance_api_config {
-    'DEFAULT/default_store':            value => 'file';
-    'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
+    'glance_store/default_store':            value => 'file';
+    'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
   }
 
   glance_cache_config {
-    'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
+    'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
   }
 }
diff --git a/glance/manifests/backend/rbd.pp b/glance/manifests/backend/rbd.pp
@@ -34,11 +34,11 @@
   }
 
   glance_api_config {
-    'DEFAULT/default_store':          value => 'rbd';
     'DEFAULT/rbd_store_ceph_conf':    value => $rbd_store_ceph_conf;
     'DEFAULT/rbd_store_user':         value => $rbd_store_user;
     'DEFAULT/rbd_store_pool':         value => $rbd_store_pool;
     'DEFAULT/rbd_store_chunk_size':   value => $rbd_store_chunk_size;
+    'glance_store/default_store':     value => 'rbd';
   }
 
   package { 'python-ceph':

diff --git a/glance/manifests/backend/swift.pp b/glance/manifests/backend/swift.pp
@@ -26,24 +26,24 @@
 ) {
 
   glance_api_config {
-    'DEFAULT/default_store':            value => 'swift';
-    'DEFAULT/swift_store_user':         value => $swift_store_user;
-    'DEFAULT/swift_store_key':          value => $swift_store_key;
-    'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
-    'DEFAULT/swift_store_container':    value => $swift_store_container;
-    'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
+    'glance_store/default_store':            value => 'swift';
+    'glance_store/swift_store_user':         value => $swift_store_user;
+    'glance_store/swift_store_key':          value => $swift_store_key;
+    'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
+    'DEFAULT/swift_store_container':         value => $swift_store_container;
+    'DEFAULT/swift_store_auth_version':      value => $swift_store_auth_version;
     'DEFAULT/swift_store_create_container_on_put':
       value => $swift_store_create_container_on_put;
     'DEFAULT/swift_store_large_object_size':
       value => $swift_store_large_object_size;
   }
 
   glance_cache_config {
-    'DEFAULT/swift_store_user':         value => $swift_store_user;
-    'DEFAULT/swift_store_key':          value => $swift_store_key;
-    'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
-    'DEFAULT/swift_store_container':    value => $swift_store_container;
-    'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
+    'glance_store/swift_store_user':         value => $swift_store_user;
+    'glance_store/swift_store_key':          value => $swift_store_key;
+    'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
+    'DEFAULT/swift_store_container':         value => $swift_store_container;
+    'DEFAULT/swift_store_auth_version':      value => $swift_store_auth_version;
     'DEFAULT/swift_store_create_container_on_put':
       value => $swift_store_create_container_on_put;
     'DEFAULT/swift_store_large_object_size':

diff --git a/glance/spec/classes/glance_api_spec.rb b/glance/spec/classes/glance_api_spec.rb
@@ -324,7 +324,7 @@
       default_params
     end
 
-    it { should_not contain_glance_api_config('DEFAULT/known_stores').with_value('false') }
+    it { should_not contain_glance_api_config('glance_store/stores').with_value('false') }
   end
 
   describe 'with known_stores override' do
@@ -334,7 +334,7 @@
       })
     end
 
-    it { should contain_glance_api_config('DEFAULT/known_stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
+    it { should contain_glance_api_config('glance_store/stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
   end
 
   describe 'with deprecated sql parameters' do

diff --git a/glance/spec/classes/glance_backend_cinder_spec.rb b/glance/spec/classes/glance_backend_cinder_spec.rb
@@ -31,7 +31,7 @@
     context 'when default parameters' do
 
       it 'configures glance-api.conf' do
-        should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
+        should contain_glance_api_config('glance_store/default_store').with_value('cinder')
         should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(false)
         should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL')
         should contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('3')
@@ -58,7 +58,7 @@
         }
       end
       it 'configures glance-api.conf' do
-        should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
+        should contain_glance_api_config('glance_store/default_store').with_value('cinder')
         should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(true)
         should contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt')
         should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL')

diff --git a/glance/spec/classes/glance_backend_file_spec.rb b/glance/spec/classes/glance_backend_file_spec.rb
@@ -10,12 +10,12 @@
   end
 
   it 'configures glance-api.conf' do
-    should contain_glance_api_config('DEFAULT/default_store').with_value('file')
-    should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+    should contain_glance_api_config('glance_store/default_store').with_value('file')
+    should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
   end
 
   it 'configures glance-cache.conf' do
-    should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+    should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
   end
 
   describe 'when overriding datadir' do
@@ -24,11 +24,11 @@
     end
 
     it 'configures glance-api.conf' do
-      should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+      should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
     end
 
     it 'configures glance-cache.conf' do
-      should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+      should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
     end
   end
 end
diff --git a/glance/spec/classes/glance_backend_rbd_spec.rb b/glance/spec/classes/glance_backend_rbd_spec.rb
@@ -14,7 +14,7 @@
       }
     end
 
-    it { should contain_glance_api_config('DEFAULT/default_store').with_value('rbd') }
+    it { should contain_glance_api_config('glance_store/default_store').with_value('rbd') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_pool').with_value('images') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('8') }