diff options
author | Zuul <zuul@review.openstack.org> | 2017-11-10 17:15:39 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-11-10 17:15:39 +0000 |
commit | df64ca710bb69f1b2db3fead86e836076f842c14 (patch) | |
tree | b8268eaf3afde34f607f9ca65d870ffb18921260 /common/deploy-steps.j2 | |
parent | e0ec12d40bf4ceae872fbb792dfbb8a1830560a4 (diff) | |
parent | 4217767d8782abae02b11f553fc14daf7cd72916 (diff) |
Merge "Refactor cellv2 host discovery logic to avoid races" into stable/pike
Diffstat (limited to 'common/deploy-steps.j2')
-rw-r--r-- | common/deploy-steps.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 5c923a99..542bf720 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -194,6 +194,7 @@ resources: kolla_config: {get_param: [role_data, {{role.name}}, kolla_config]} bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']} puppet_step_config: {get_param: [role_data, {{role.name}}, step_config]} + docker_config_scripts: {get_param: [role_data, {{role.name}}, docker_config_scripts]} tasks: # Join host_prep_tasks with the other per-host configuration list_concat: @@ -217,6 +218,11 @@ resources: # FIXME: can we move docker-puppet somewhere so it's installed via a package? - name: Write docker-puppet.py copy: content="{{docker_puppet_script}}" dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600 + - name: Create /var/lib/docker-config-scripts + file: path=/var/lib/docker-config-scripts state=directory + - name: Write docker config scripts + copy: content="{{item.value.content}}" dest="/var/lib/docker-config-scripts/{{item.key}}" force=yes mode="{{item.value.mode|default('0600', true)}}" + with_dict: "{{docker_config_scripts}}" # Here we are dumping all the docker container startup configuration data # so that we can have access to how they are started outside of heat # and docker-cmd. This lets us create command line tools to test containers. |