Set default_floating_pool and aliases param correctly

puppet-nova has removed the following deprecated options
from nova::api class in [1]:-
- default_floating_pool
- aliases

Switch to ::nova::network::neutron and ::nova::pci to
set them.
Default for default_floating_pool will be taken care by
puppet-nova.

[1] https://review.openstack.org/#/c/569540

Change-Id: Ifc425070bff473b388bd20cb5cea446cf4862c59
This commit is contained in:
yatin 2018-05-25 12:36:39 +05:30
parent e9e6ad87a0
commit 7c6e829d40
2 changed files with 12 additions and 16 deletions

View File

@ -8,13 +8,6 @@ class packstack::nova::api ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
$config_use_neutron = hiera('CONFIG_NEUTRON_INSTALL')
if $config_use_neutron == 'y' {
$default_floating_pool = 'public'
} else {
$default_floating_pool = 'nova'
}
$auth_uri = hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS')
$admin_password = hiera('CONFIG_NOVA_KS_PW')
@ -35,14 +28,16 @@ class packstack::nova::api ()
metadata_listen => $bind_host,
enabled => true,
neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
default_floating_pool => $default_floating_pool,
pci_alias => $pci_alias,
sync_db_api => true,
osapi_compute_workers => hiera('CONFIG_SERVICE_WORKERS'),
metadata_workers => hiera('CONFIG_SERVICE_WORKERS'),
allow_resize_to_same_host => hiera('CONFIG_NOVA_ALLOW_RESIZE_TO_SAME'),
}
class { '::nova::pci':
aliases => $pci_alias,
}
class { '::nova::wsgi::apache_placement':
bind_host => $bind_host,
api_port => '8778',

View File

@ -4,13 +4,14 @@ class packstack::nova::neutron ()
$neutron_auth_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
class { '::nova::network::neutron':
neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_type => 'v3password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_project_name => 'services',
neutron_auth_url => "${neutron_auth_url}/v3",
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
neutron_url_timeout => '60',
default_floating_pool => 'public',
neutron_password => hiera('CONFIG_NEUTRON_KS_PW'),
neutron_auth_type => 'v3password',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_project_name => 'services',
neutron_auth_url => "${neutron_auth_url}/v3",
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
neutron_url_timeout => '60',
}
class { '::nova::compute::neutron':