diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-07 13:34:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-07 13:34:35 +0000 |
| commit | c1421dd565bafa73db276e71aa9eac21212209d3 (patch) | |
| tree | bce91afe1e7d7d1277a84bb2ef7344a87af9b917 /puppet/services/manila-share.yaml | |
| parent | cc67cc7be4d4187fa9227813fddc251574b560b6 (diff) | |
| parent | f20c044c73d33dd031ce3f760a5c6dd0f7bfb3c9 (diff) | |
Merge "Include keystone authtoken config in manila-share service"
Diffstat (limited to 'puppet/services/manila-share.yaml')
| -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 |