openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix wrong hieradata for glance api authtoken 

glance::keystone::authtoken should be glance::api::authtoken

Conflicts:
        deployment/glance/glance-api-container-puppet.yaml

Conflicts:
        puppet/services/glance-api.yaml

Closes-bug: #1841864
Change-Id: I8acebc67ed58b958552286ea7646a01065d6c1d2
(cherry picked from commit 474c0ed428)
(cherry picked from commit 3388018248)
(cherry picked from commit b406ff0315)
This commit is contained in:
Takashi Kajinami 2019-08-29 09:39:39 +09:00
parent f16a588ad8
commit 1c05491533
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/services/glance-api.yaml
View File

@ -264,8 +264,8 @@ outputs:
- 9292
- 13292
glance::api::authtoken::project_name: 'service'
glance::keystone::authtoken::user_domain_name: 'Default'
glance::keystone::authtoken::project_domain_name: 'Default'
glance::api::authtoken::user_domain_name: 'Default'
glance::api::authtoken::project_domain_name: 'Default'
glance::api::pipeline: 'keystone'
glance::api::show_image_direct_url: true
glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}