Stop writing /var/lib/container-startup-configs.json

Now that we've dropped docker-toool we no longer have use
for the /var/lib/container-startup-configs.json file to be laid
down on disk.

As part of this change we now check for the step 1 tasks instead
of the combined startup configs when determining whether to
re-run the common startup ansible tasks.

Change-Id: I3c50d8364823073341b5f39ecce20a512e4a82e1
This commit is contained in:
Dan Prince 2019-04-08 09:09:35 -04:00
parent b98519d095
commit 4bf9687d97
2 changed files with 3 additions and 16 deletions

View File

@ -267,8 +267,6 @@
# Here we are dumping all the container startup configuration data
# so that we can have access to how they are started outside of heat
# and container cmd. This lets us create command line tools to test containers.
# FIXME We need to update the defaults, e.g in docker-tool, so we can remove the
# container-startup-configs.json and use per-step configs instead
- name: Set container_config_default fact
no_log: True
set_fact:
@ -286,18 +284,7 @@
tags:
- container_startup_configs
- name: Write container-startup-configs
no_log: True
copy:
content: "{{ container_config_with_default | to_nice_json }}"
dest: /var/lib/container-startup-configs.json
force: yes
mode: '0600'
tags:
- container_startup_configs
diff: no
- name: Write per-step container-startup-configs
- name: Write per-step container startup configs
no_log: True
copy:
content: "{{ item[1] | to_nice_json }}"

View File

@ -427,9 +427,9 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- name: Check if /var/lib/container-startup-configs.json already exists
- name: Check if /var/lib/tripleo-config/container-startup-config-1.json already exists
stat:
path: /var/lib/container-startup-configs.json
path: /var/lib/tripleo-config/container-startup-config-1.json
register: container_startup_configs_json_stat
- import_tasks: common_deploy_steps_tasks.yaml
when: