aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/nova-base.yaml
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-08 16:01:01 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-09 08:23:59 +0300
commit0caf0a0b714e4477594119a5d281b7041d89486e (patch)
treea5083c72d49ae2386e30144b5881f9f315b75342 /puppet/services/nova-base.yaml
parent69ea053eeb05378cc6ea84e2481d889fe70e09be (diff)
Move neutron-related options for nova to base profile
Change-Id: I21c09b2b0bad7736f3c84c55bf14ef7986c2d108
Diffstat (limited to 'puppet/services/nova-base.yaml')
-rw-r--r--puppet/services/nova-base.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 868b76cf..5bc94b2b 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -13,6 +13,10 @@ parameters:
description: The password for the nova service and db account, used by nova-api.
type: string
hidden: true
+ NeutronPassword:
+ description: The password for the neutron service and db account, used by neutron agents.
+ type: string
+ hidden: true
RabbitPassword:
description: The password for RabbitMQ
type: string
@@ -82,6 +86,9 @@ outputs:
nova::network::neutron::neutron_project_name: 'service'
nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::dhcp_domain: ''
+ nova::network::neutron::neutron_password: {get_param: NeutronPassword}
+ nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
+ nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
nova::rabbit_heartbeat_timeout_threshold: 60
nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
nova::host: '"%{::fqdn}"' # NOTE: extra quoting is needed.