summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-07 23:46:06 +0000
committerGerrit Code Review <review@openstack.org>2017-02-07 23:46:06 +0000
commit9dc9c65522f04a782f5d60dc903b50af7f684392 (patch)
treec2354bb5de59fe943773d77170a390b07bc8eb1d /puppet/services
parentd5b44ae7dc03bf999b696f540061220fe6137b11 (diff)
parent07876f2d90aaa9f091a8c50d15bab3675a6b844c (diff)
Merge "Add registry and role service list entries for Octavia"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/octavia-api.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml
index 4c6f4c37..58223baf 100644
--- a/puppet/services/octavia-api.yaml
+++ b/puppet/services/octavia-api.yaml
@@ -70,13 +70,15 @@ outputs:
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
octavia::keystone::authtoken::project_name: 'service'
+ octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
octavia::api::sync_db: true
tripleo.octavia_api.firewall_rules:
'120 octavia api':
dport:
- 9876
- 13876
- octavia::host: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
+ octavia::api::host: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
+ neutron::server::service_providers: ['LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default']
step_config: |
include tripleo::profile::base::octavia::api
service_config_settings: