aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/keystone.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 10:32:52 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 10:32:52 +0000
commit47fcabee464b1e46490087316778b3cff0a55b5b (patch)
treef15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/keystone.yaml
parentccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff)
parent610850140d605b18f4a28099f160fff1e489443d (diff)
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/keystone.yaml')
-rw-r--r--docker/services/keystone.yaml10
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index e09fd76..f9b94a7 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -49,7 +49,7 @@ outputs:
map_merge:
- get_attr: [KeystoneBase, role_data, config_settings]
- apache::default_vhost: false
- step_config:
+ step_config: &step_config
list_join:
- "\n"
- - "['Keystone_user', 'Keystone_endpoint', 'Keystone_domain', 'Keystone_tenant', 'Keystone_user_role', 'Keystone_role', 'Keystone_service'].each |String $val| { noop_resource($val) }"
@@ -60,9 +60,11 @@ outputs:
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
- puppet_tags: keystone_config
- config_volume: keystone
- config_image: *keystone_image
+ puppet_config:
+ config_volume: keystone
+ puppet_tags: keystone_config
+ step_config: *step_config
+ config_image: *keystone_image
kolla_config:
/var/lib/kolla/config_files/keystone.json:
command: /usr/sbin/httpd -DFOREGROUND