summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 12:30:44 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 12:30:44 +0000
commit8794610ceea3ae9537c302be595361f3bdad642a (patch)
tree003a343b8576e9d09b94c25033f96d0dcc46b682 /puppet/services
parentf730f19f1c1681ae39b9ecd2484356c481c25f96 (diff)
parent0caf0a0b714e4477594119a5d281b7041d89486e (diff)
Merge "Move neutron-related options for nova to base profile"
Diffstat (limited to 'puppet/services')
-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.