diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp index 2d18f9ce74..3001dba809 100644 --- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp +++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp @@ -462,7 +462,13 @@ $ironic_api_nodes = $controller_nodes $ssl_hash = hiera_hash('use_ssl', {}) $public_ssl_hash = hiera('public_ssl') $public_vnc_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'nova', 'public', 'protocol', 'http') -$real_nova_hash = merge($nova_hash, { 'vncproxy_protocol' => $public_vnc_protocol }) +$real_nova_hash = merge($nova_hash, { 'vncproxy_protocol' => $public_vnc_protocol, + 'nova_rate_limits' => $nova_rate_limits, + 'nova_report_interval' => $nova_report_interval, + 'nova_service_down_time' => $nova_service_down_time, + 'num_networks' => $num_networks, + 'network_size' => $network_size, + 'network_manager' => $network_manager}) # Define how we should get memcache addresses if hiera('memcached_addresses', false) { diff --git a/deployment/puppet/osnailyfacter/modular/ironic/ironic-compute.pp b/deployment/puppet/osnailyfacter/modular/ironic/ironic-compute.pp index c62f9aac82..eba18debab 100644 --- a/deployment/puppet/osnailyfacter/modular/ironic/ironic-compute.pp +++ b/deployment/puppet/osnailyfacter/modular/ironic/ironic-compute.pp @@ -21,8 +21,8 @@ $syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_LOCAL $syslog_log_facility_nova = hiera('syslog_log_facility_nova', 'LOG_LOCAL6') $amqp_hosts = hiera('amqp_hosts') $rabbit_hash = hiera_hash('rabbit') -$nova_report_interval = hiera('nova_report_interval') -$nova_service_down_time = hiera('nova_service_down_time') +$nova_report_interval = $nova_hash['nova_report_interval'] +$nova_service_down_time = $nova_hash['nova_service_down_time'] $neutron_config = hiera_hash('quantum_settings') $ironic_tenant = pick($ironic_hash['tenant'],'services') diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp index d0606f1fdc..7818085356 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp @@ -16,10 +16,7 @@ $network_scheme = hiera_hash('network_scheme', {}) $network_metadata = hiera_hash('network_metadata', {}) prepare_network_config($network_scheme) -$nova_rate_limits = hiera('nova_rate_limits') $primary_controller = hiera('primary_controller') -$nova_report_interval = hiera('nova_report_interval') -$nova_service_down_time = hiera('nova_service_down_time') $use_syslog = hiera('use_syslog', true) $use_stderr = hiera('use_stderr', false) $syslog_log_facility_nova = hiera('syslog_log_facility_nova','LOG_LOCAL6') @@ -27,6 +24,7 @@ $management_vip = hiera('management_vip') $sahara_hash = hiera_hash('sahara', {}) $storage_hash = hiera_hash('storage', {}) $nova_hash = hiera_hash('nova', {}) +$nova_rate_limits = $nova_hash['nova_rate_limits'] $nova_config_hash = hiera_hash('nova_config', {}) $api_bind_address = get_network_role_property('nova/api', 'ipaddr') $rabbit_hash = hiera_hash('rabbit', {}) @@ -189,8 +187,8 @@ class { 'nova': use_syslog => $use_syslog, use_stderr => $use_stderr, database_idle_timeout => $idle_timeout, - report_interval => $nova_report_interval, - service_down_time => $nova_service_down_time, + report_interval => $nova_hash['nova_report_interval'], + service_down_time => $nova_hash['nova_service_down_time'], notify_api_faults => pick($nova_hash['notify_api_faults'], false), notification_driver => $nova_notification_driver, memcached_servers => $memcached_addresses, diff --git a/deployment/puppet/osnailyfacter/modular/roles/compute.pp b/deployment/puppet/osnailyfacter/modular/roles/compute.pp index 27bdb49776..acce6f147f 100644 --- a/deployment/puppet/osnailyfacter/modular/roles/compute.pp +++ b/deployment/puppet/osnailyfacter/modular/roles/compute.pp @@ -43,9 +43,6 @@ $base_syslog_hash = hiera_hash('base_syslog', {}) $use_syslog = hiera('use_syslog', true) $use_stderr = hiera('use_stderr', false) $syslog_log_facility = hiera('syslog_log_facility_nova','LOG_LOCAL6') -$nova_rate_limits = hiera('nova_rate_limits') -$nova_report_interval = hiera('nova_report_interval') -$nova_service_down_time = hiera('nova_service_down_time') $config_drive_format = 'vfat' $public_ssl_hash = hiera_hash('public_ssl') $ssl_hash = hiera_hash('use_ssl', {}) @@ -170,8 +167,8 @@ class { '::openstack::compute': network_device_mtu => $network_device_mtu, use_syslog => $use_syslog, syslog_log_facility => $syslog_log_facility, - nova_report_interval => $nova_report_interval, - nova_service_down_time => $nova_service_down_time, + nova_report_interval => $nova_hash['nova_report_interval'], + nova_service_down_time => $nova_hash['nova_service_down_time'], state_path => $nova_hash[state_path], storage_hash => $storage_hash, config_drive_format => $config_drive_format, diff --git a/deployment/puppet/osnailyfacter/templates/globals_yaml.erb b/deployment/puppet/osnailyfacter/templates/globals_yaml.erb index dade2f08ae..4ebd12f79e 100644 --- a/deployment/puppet/osnailyfacter/templates/globals_yaml.erb +++ b/deployment/puppet/osnailyfacter/templates/globals_yaml.erb @@ -53,9 +53,7 @@ <% globals.store "murano_roles", @murano_roles -%> <% globals.store "mysql", @mysql_hash -%> <% globals.store "network_config", @network_config -%> -<% globals.store "network_manager", @network_manager -%> <% globals.store "network_scheme", @network_scheme -%> -<% globals.store "network_size", @network_size -%> <% globals.store "neutron_config", @neutron_config -%> <% globals.store "neutron_db_password", @neutron_db_password -%> <% globals.store "neutron_metadata_proxy_secret", @neutron_metadata_proxy_secret -%> @@ -64,11 +62,7 @@ <% globals.store "node", @node_hash -%> <% globals.store "nova_db_password", @nova_db_password -%> <% globals.store "nova", @real_nova_hash -%> -<% globals.store "nova_rate_limits", @nova_rate_limits -%> -<% globals.store "nova_report_interval", @nova_report_interval -%> -<% globals.store "nova_service_down_time", @nova_service_down_time -%> <% globals.store "novanetwork_params", @novanetwork_params -%> -<% globals.store "num_networks", @num_networks -%> <% globals.store "openstack_version", @openstack_version -%> <% globals.store "primary_controller", @primary_controller -%> <% globals.store "private_int", @private_int -%> diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb index a38fd69df1..67a3ed1c1b 100644 --- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb +++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb @@ -117,8 +117,8 @@ describe manifest do let(:syslog_log_facility_nova) { Noop.hiera 'syslog_log_facility_nova', 'LOG_LOCAL6' } let(:use_syslog) { Noop.hiera 'use_syslog', true } let(:use_stderr) { Noop.hiera 'use_stderr', false } - let(:nova_report_interval) { Noop.hiera 'nova_report_interval' } - let(:nova_service_down_time) { Noop.hiera 'nova_service_down_time' } + let(:nova_report_interval) { Noop.puppet_function 'pick', nova_hash['nova_report_interval'], nil } + let(:nova_service_down_time) { Noop.puppet_function 'pick', nova_hash['nova_service_down_time'], nil } let(:notify_api_faults) { Noop.puppet_function 'pick', nova_hash['notify_api_faults'], false } let(:cinder_catalog_info) { Noop.puppet_function 'pick', nova_hash['cinder_catalog_info'], 'volumev2:cinderv2:internalURL' } let(:nova_notification_driver) do diff --git a/tests/noop/spec/hosts/roles/compute_spec.rb b/tests/noop/spec/hosts/roles/compute_spec.rb index 73c3180eba..02abdb1281 100644 --- a/tests/noop/spec/hosts/roles/compute_spec.rb +++ b/tests/noop/spec/hosts/roles/compute_spec.rb @@ -63,6 +63,9 @@ describe manifest do Noop.puppet_function('get_nic_passthrough_whitelist', 'sriov') end + let(:nova_report_interval) { Noop.puppet_function 'pick', nova_hash['nova_report_interval'], nil } + let(:nova_service_down_time) { Noop.puppet_function 'pick', nova_hash['nova_service_down_time'], nil } + # Legacy openstack-compute tests if ironic_enabled @@ -348,10 +351,14 @@ describe manifest do # Check out nova config params it 'should properly configure nova' do + node_name = Noop.hiera('node_name') network_metadata = Noop.hiera_hash('network_metadata') roles = network_metadata['nodes'][node_name]['node_roles'] - nova_hash.merge!({'vncproxy_protocol' => vncproxy_protocol}) + nova_hash.merge!({'vncproxy_protocol' => vncproxy_protocol, + 'nova_report_interval' => nova_report_interval, + 'nova_service_down_time'=> nova_service_down_time, + }) if roles.include? 'ceph-osd' nova_compute_rhostmem = rhost_mem['reserved_host_memory']