diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-19 11:07:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-19 11:07:35 +0000 |
| commit | 558cd7d09ce0604dd744a3fd2166ce361ad90cc2 (patch) | |
| tree | 1364a3a075e8afa46422cf4d3f32c28ba7c4a4ca /puppet | |
| parent | 5e8f3617235c4f4ad2fc9efddc0b9879e3b08df9 (diff) | |
| parent | 788bafd901d2a86114711d0133768935a696715b (diff) | |
Merge "puppet: tidy up the compute nova neutron config"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute-puppet.yaml | 14 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index ae2689d3..8df61b22 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -315,6 +315,8 @@ resources: neutron_physical_bridge: {get_input: neutron_physical_bridge} neutron_public_interface: {get_input: neutron_public_interface} 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} neutron_router_distributed: {get_input: neutron_router_distributed} neutron_agent_mode: {get_input: neutron_agent_mode} neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} @@ -375,6 +377,18 @@ resources: neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers} neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} + neutron_url: + list_join: + - '' + - - 'http://' + - {get_param: NeutronHost} + - ':9696' + neutron_admin_auth_url: + list_join: + - '' + - - 'http://' + - {get_param: NeutronHost} + - ':35357/v2.0' admin_password: {get_param: AdminPassword} rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 0c870c35..8468cd39 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -58,12 +58,7 @@ if $nova_enable_rbd_backend { } include ::nova::compute::libvirt - -class { 'nova::network::neutron': - neutron_admin_auth_url => join(['http://', hiera('neutron_host'), ':35357/v2.0']), - neutron_url => join(['http://', hiera('neutron_host'), ':9696']), -} - +include ::nova::network::neutron include ::neutron class { 'neutron::plugins::ml2': |