summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 06:34:36 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 06:34:36 +0000
commit8431e7412ab8fd7a77befafd0ab687be599ad970 (patch)
tree8eea69cc5db30e398e2d814b54163af8114755d8 /puppet
parentf2d0901270b6781a5b8ed37aab47da51b79e907c (diff)
parentbdccc1cb760ea545dc1c0e12b1088e3b61886929 (diff)
Merge "manila: set "neutron_admin_auth_url" correctly" into stable/pike
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/manila-scheduler.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index 7d43f685..364a1a3d 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -70,7 +70,7 @@ outputs:
manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
manila::compute::nova::nova_admin_tenant_name: 'service'
manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
- manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
+ manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
step_config: |
include ::tripleo::profile::base::manila::scheduler