Merge "Move refs for OpenStack puppet modules to upstream master"

deployment/Puppetfile

@@ -94,27 +94,27 @@ mod 'postgresql',
 # Pull in puppet-openstacklib
 mod 'openstacklib',
     :git => 'https://github.com/fuel-infra/puppet-openstacklib.git',
-    :ref => '8.0.0-rc2'
+    :ref => 'master'
 
 # Pull in puppet-keystone
 mod 'keystone',
     :git => 'https://github.com/fuel-infra/puppet-keystone.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in puppet-neutron
 mod 'neutron',
     :git => 'https://github.com/fuel-infra/puppet-neutron.git',
-    :ref => '8.0.0-rc2'
+    :ref => 'master'
 
 # Pull in puppet-nova
 mod 'nova',
     :git => 'https://github.com/fuel-infra/puppet-nova.git',
-    :ref => '8.0.0-rc2'
+    :ref => 'master'
 
 # Pull in puppet-heat
 mod 'heat',
     :git => 'https://github.com/fuel-infra/puppet-heat.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in puppet-horizon
 mod 'horizon',
@@ -124,27 +124,27 @@ mod 'horizon',
 # Pull in puppet-glance
 mod 'glance',
     :git => 'https://github.com/fuel-infra/puppet-glance.git',
-    :ref => '8.0.0-rc2'
+    :ref => 'master'
 
 # Pull in puppet-swift
 mod 'swift',
     :git => 'https://github.com/fuel-infra/puppet-swift.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in puppet-ceilometer
 mod 'ceilometer',
     :git => 'https://github.com/fuel-infra/puppet-ceilometer.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in openstack-cinder
 mod 'cinder',
     :git => 'https://github.com/fuel-infra/openstack-cinder.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in puppet-sahara
 mod 'sahara',
     :git => 'https://github.com/fuel-infra/puppet-sahara.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in puppet-openssl
 mod 'openssl',
@@ -179,7 +179,7 @@ mod 'tftp',
 # Pull in puppet-ironic
 mod 'ironic',
     :git => 'https://github.com/fuel-infra/puppet-ironic.git',
-    :ref => '8.0.0-rc1'
+    :ref => 'master'
 
 # Pull in richardc-datacat
 mod 'datacat',

deployment/puppet/openstack/manifests/cinder.pp

@@ -122,6 +122,7 @@ class openstack::cinder(
         database_max_retries   => $max_retries,
         database_max_overflow  => $max_overflow,
         control_exchange       => 'cinder',
+        rabbit_ha_queues       => $rabbit_ha_queues,
       }
 
       cinder_config {

deployment/puppet/openstack/manifests/compute.pp

@@ -281,6 +281,11 @@ class openstack::compute (
     cinder_catalog_info    => pick($nova_hash['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
   }
 
+  class {'::nova::availability_zone':
+    default_availability_zone => $nova_hash['default_availability_zone'],
+    default_schedule_zone     => $nova_hash['default_schedule_zone'],
+  }
+
   if str2bool($::is_virtual) {
     $libvirt_cpu_mode = 'none'
   } else {
@@ -315,8 +320,6 @@ class openstack::compute (
     instance_usage_audit          => $instance_usage_audit,
     instance_usage_audit_period   => $instance_usage_audit_period,
     reserved_host_memory          => $nova_hash['reserved_host_memory'],
-    default_availability_zone     => $nova_hash['default_availability_zone'],
-    default_schedule_zone         => $nova_hash['default_schedule_zone'],
     config_drive_format           => $config_drive_format,
     allow_resize_to_same_host     => true,
   }

deployment/puppet/openstack/manifests/glance.pp

@@ -136,9 +136,7 @@ class openstack::glance (
   # these parameters after new sync for glance module
   # (https://review.openstack.org/#/c/238096/)
   glance_cache_config {
-    'DEFAULT/use_syslog':       value => $use_syslog;
     'DEFAULT/image_cache_dir':  value => '/var/lib/glance/image-cache/';
-    'DEFAULT/log_file':         value => '/var/log/glance/image-cache.log';
     'DEFAULT/os_region_name':   value => $region;
   }
 

deployment/puppet/openstack/spec/classes/openstack_ceilometer_spec.rb

@@ -112,6 +112,7 @@ describe 'openstack::ceilometer' do
         :processorcount  => 2,
         :memorysize_mb   => 4096,
         :os_service_default => '<SERVICE DEFAULT>',
+        :operatingsystemmajrelease => '7',
       }
     end
 

deployment/puppet/openstack/spec/classes/openstack_cinder_spec.rb

@@ -68,6 +68,7 @@ describe 'openstack::cinder' do
         :memorysize_mb => 1024,
         :openstack_version => { 'nova' => 'present' },
         :os_service_default => '<SERVICE DEFAULT>',
+        :operatingsystemmajrelease => '7',
       }
     end
 

deployment/puppet/openstack/spec/classes/openstack_compute_spec.rb

@@ -127,7 +127,11 @@ describe 'openstack::compute' do
           :report_interval   => p[:nova_report_interval],
           :service_down_time => p[:nova_service_down_time],
           :notify_on_state_change => 'vm_and_task_state',
-          :memcached_servers => ['127.0.0.1:11211']
+          :memcached_servers => ['127.0.0.1:11211'],
+        )
+        should contain_class('nova::availability_zone').with(
+          :default_availability_zone => '<SERVICE DEFAULT>',
+          :default_schedule_zone     => '<SERVICE DEFAULT>',
         )
         should contain_class('nova::compute').with(
           :ensure_package => 'present',
@@ -142,7 +146,6 @@ describe 'openstack::compute' do
           :network_device_mtu => '65000',
           :instance_usage_audit => true,
           :instance_usage_audit_period => 'hour',
-          :default_availability_zone => 'nova',
           :default_schedule_zone => nil,
           :config_drive_format => p[:config_drive_format]
         )
@@ -211,6 +214,7 @@ describe 'openstack::compute' do
         :openstack_version  => { 'nova' => 'present' },
         :os_service_default => '<SERVICE DEFAULT>',
         :os_package_type    => 'rpm',
+        :operatingsystemmajrelease => '7',
       }
     end
 

deployment/puppet/openstack/spec/classes/openstack_galera_client_spec.rb

@@ -92,6 +92,7 @@ describe 'openstack::galera::client' do
       {
         :osfamily        => 'RedHat',
         :operatingsystem => 'RedHat',
+        :operatingsystemmajrelease => '7',
       }
     end
 

tests/noop/spec/hosts/ceilometer/controller_spec.rb

@@ -111,9 +111,9 @@ describe manifest do
         fallback_workers = [[facts[:processorcount].to_i, 2].max, workers_max.to_i].min
         service_workers = Noop.puppet_function 'pick', ceilometer_hash['workers'], fallback_workers
 
-        should contain_ceilometer_config('DEFAULT/api_workers').with(:value => service_workers)
-        should contain_ceilometer_config('DEFAULT/collector_workers').with(:value => service_workers)
-        should contain_ceilometer_config('DEFAULT/notification_workers').with(:value => service_workers)
+        should contain_ceilometer_config('api/workers').with(:value => service_workers)
+        should contain_ceilometer_config('collector/workers').with(:value => service_workers)
+        should contain_ceilometer_config('notification/workers').with(:value => service_workers)
       end
     end
 

tests/noop/spec/hosts/glance/glance_spec.rb

@@ -111,7 +111,7 @@ describe manifest do
     it 'should configure glance cache config' do
       should contain_glance_cache_config('DEFAULT/use_syslog').with_value(use_syslog)
       should contain_glance_cache_config('DEFAULT/image_cache_dir').with_value('/var/lib/glance/image-cache/')
-      should contain_glance_cache_config('DEFAULT/log_file').with_value('/var/log/glance/image-cache.log')
+      should contain_glance_cache_config('DEFAULT/log_file').with_value('/var/log/glance/cache.log')
       should contain_glance_cache_config('DEFAULT/image_cache_stall_time').with_value('86400')
       should contain_glance_cache_config('DEFAULT/os_region_name').with_value(region)
       should contain_glance_cache_config('glance_store/os_region_name').with_value(region)

tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb

@@ -104,7 +104,7 @@ describe manifest do
       lock_path = '/var/lib/cinder/tmp'
     end
 
-    should contain_cinder_config('DEFAULT/lock_path').with(:value  => lock_path)
+    should contain_cinder_config('oslo_concurrency/lock_path').with(:value  => lock_path)
   end
 
   it 'ensures cinder_config contains use_stderr set to false' do