diff options
| author |   Steve Baker <sbaker@redhat.com> | 2017-02-28 23:34:51 +0000 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2017-03-01 03:14:49 +0000 |
| commit | 93561bde0aaaa82d1ceacccb91ff8b623a9963cb (patch) | |
| tree | 4797148d91b358a5c3b07a4f586f4c6d2f16346c /docker/services/keystone.yaml | |
| parent | c992dcf51a3a6ab75eeb9e15c55e03f317f7633c (diff) | |
Switch to dict format for docker_puppet_tasks
This change gives the option of docker-puppet.py data to be in a dict
as well as a list. This allows docker_puppet_tasks data to use the
same keys as the top level puppet config data.
If the yaql fu can be worked out to build the top level data,
docker-puppet.py can later drop the list format entirely.
Change-Id: I7e2294c6c898d2340421c93516296ccf120aa6d2
Diffstat (limited to 'docker/services/keystone.yaml')
| -rw-r--r-- | docker/services/keystone.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 2bf8fa09..644326e0 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -145,9 +145,10 @@ outputs: docker_puppet_tasks: # Keystone endpoint creation occurs only on single node step_3: - - 'keystone_init_tasks' - - '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' - - 'include ::tripleo::profile::base::keystone' - - list_join: + 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} ] |