tripleo-heat-templates/puppet/services/manila-scheduler.yaml
Tom Barron 1897de9f6f manila: set "neutron_admin_auth_url" correctly
It was being set using NeutronAdmin endpoint but it is an
authorization url.  Set it using KeystoneInternal endpoint.

Change-Id: I23f4a895628ac909a1fe1f93cecefa84f25858b1
Closes-Bug: #1712908
(cherry picked from commit 7380183cf5)
(cherry picked from commit bdccc1cb76)
2017-09-06 11:02:57 +00:00

62 lines
2.2 KiB
YAML

heat_template_version: ocata
description: >
Manila-scheduler service configured with Puppet
parameters:
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NovaPassword:
type: string
description: The password for the nova service and db account, used by nova-api.
hidden: true
NeutronPassword:
description: The password for the neutron service and db account, used by neutron agents.
type: string
hidden: true
ManilaPassword:
description: The password for the manila service account.
type: string
hidden: true
MonitoringSubscriptionManilaScheduler:
default: 'overcloud-manila-scheduler'
type: string
resources:
ManilaBase:
type: ./manila-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Manila-scheduler role.
value:
service_name: manila_scheduler
monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler}
config_settings:
map_merge:
- get_attr: [ManilaBase, role_data, config_settings]
- manila::compute::nova::nova_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
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, KeystoneInternal, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
step_config: |
include ::tripleo::profile::base::manila::scheduler