From 1f018babcf4daca989758c2462b27e4137a9cd0f Mon Sep 17 00:00:00 2001 From: Martin André Date: Thu, 9 Mar 2017 16:48:06 +0100 Subject: Cleanup docker services templates Use yaml anchors wherever possible for image definition and drop unused anchors. Renamed parameters to Docker*ConfigImage to clarify that an image is specifically used to generate configuration files. Change-Id: I388bd59de7f1d36a3a881fbb723ba5bcba09e637 --- docker/services/keystone.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docker/services/keystone.yaml') diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index bd3a010e..2099f09a 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -149,10 +149,7 @@ outputs: config_volume: 'keystone_init_tasks' puppet_tags: 'keystone_config,keystone_domain_config,keystone_endpoint,keystone_identity_provider,keystone_paste_ini,keystone_role,keystone_service,keystone_tenant,keystone_user,keystone_user_role,keystone_domain' step_config: 'include ::tripleo::profile::base::keystone' - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ] + config_image: *keystone_image upgrade_tasks: - name: Stop and disable keystone service (running under httpd) tags: step2 -- cgit 1.2.3-korg