summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/compute-puppet.yaml14
-rw-r--r--puppet/manifests/overcloud_compute.pp7
2 files changed, 15 insertions, 6 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index e6b5a78b..70059817 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -306,6 +306,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}
@@ -365,6 +367,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 0d2790b2..150e9858 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -46,12 +46,7 @@ nova_config {
}
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':