diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2016-11-04 12:28:18 -0500 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2016-11-04 12:28:18 -0500 |
| commit | f20c044c73d33dd031ce3f760a5c6dd0f7bfb3c9 (patch) | |
| tree | 96e86e506eabe989c6f2767621431e013c73ed9f | |
| parent | cac8c7d28584a56321dbaf8b0ca5fd6e8986deb2 (diff) | |
Include keystone authtoken config in manila-share service
Because manila-share is a pacemaker-managed service, it has to be
on the controller node. If you deploy the api services to a
different node, then manila-share loses access to the authtoken
hieradata generated by manila-api. Adding it explicitly to the
manila-share config allows this setup to deploy sanely.
Note that I'm having a different problem with manila db-syncs in
this setup, so there's likely another patch required to get it
fully working.
Change-Id: Iac782fa67ea912d24b9905dd8bbafb8ff28dd669
Partial-Bug: 1633077
| -rw-r--r-- | puppet/services/manila-share.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml index e42d2fae..d5ff8a05 100644 --- a/puppet/services/manila-share.yaml +++ b/puppet/services/manila-share.yaml @@ -21,6 +21,10 @@ parameters: MonitoringSubscriptionManilaShare: default: 'overcloud-manila-share' type: string + ManilaPassword: + description: The password for the manila service account. + type: string + hidden: true resources: ManilaBase: @@ -40,5 +44,9 @@ outputs: map_merge: - get_attr: [ManilaBase, role_data, config_settings] - manila::volume::cinder::cinder_admin_tenant_name: 'service' + manila::keystone::authtoken::password: {get_param: ManilaPassword} + manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } + manila::keystone::authtoken::project_name: 'service' step_config: | include ::tripleo::profile::base::manila::share |