diff options
| -rw-r--r-- | puppet/controller-puppet.yaml | 16 | ||||
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/compute.yaml | 5 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 |
4 files changed, 23 insertions, 5 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 5f9bd8b5..3e2957f9 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -506,6 +506,18 @@ resources: - - 'mysql://neutron:unset@' - {get_param: VirtualIP} - '/ovs_neutron?charset=utf8' + neutron_url: + list_join: + - '' + - - 'http://' + - {get_param: VirtualIP} + - ':9696' + neutron_admin_auth_url: + list_join: + - '' + - - 'http://' + - {get_param: VirtualIP} + - ':35357/v2.0' ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} ceilometer_dsn: @@ -701,6 +713,10 @@ resources: nova::api::admin_password: {get_input: nova_password} nova::database_connection: {get_input: nova_dsn} nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} + nova::network::neutron::neutron_admin_password: {get_input: neutron_password} + nova::network::neutron::neutron_url: {get_input: neutron_url} + nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url} + # Rabbit rabbit_username: {get_input: rabbit_username} rabbit_password: {get_input: rabbit_password} diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index a75bbe39..14ba97e2 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -6,3 +6,9 @@ ceilometer::agent::auth::auth_region: 'regionOne' # FIXME: Might be better to use 'service' tenant here but this requires # changes in the tripleo-incubator keystone role setup ceilometer::agent::auth::auth_tenant_name: 'admin' + +nova::network::neutron::neutron_admin_tenant_name: 'service' +nova::network::neutron::neutron_admin_username: 'neutron' +nova::network::neutron::vif_plugging_is_fatal: false +nova::network::neutron::vif_plugging_timeout: 30 + diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index ffa716a4..8d5c88fd 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -10,11 +10,6 @@ nova::compute::vnc_enabled: true nova::compute::libvirt::vncserver_listen: '0.0.0.0' nova::compute::libvirt::migration_support: true -nova::network::neutron::neutron_admin_tenant_name: 'service' -nova::network::neutron::neutron_admin_username: 'neutron' -nova::network::neutron::vif_plugging_is_fatal: false -nova::network::neutron::vif_plugging_timeout: 30 - neutron::plugins::ml2::tunnel_id_ranges: ['1:1000'] ceilometer::agent::auth::auth_tenant_name: 'service' diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 390eddac..81e8799e 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -210,6 +210,7 @@ if hiera('step') >= 2 { include ::nova::cert include ::nova::conductor include ::nova::consoleauth + include ::nova::network::neutron include ::nova::vncproxy include ::nova::scheduler |