Merge "Get rid of the old container images environment file."

tasks/update/create-overcloud-update-scripts.yaml

@@ -48,6 +48,8 @@
   import_tasks: ../common/load_roles_from_inventory.yaml
 
 - name: create overcloud update prepare script
+  vars:
+    old_img: "{{ working_dir }}/{{ container_registry_file }}"
   template:
     src: "overcloud_update_prepare.sh.j2"
     dest: "{{ overcloud_update_prepare_script }}"
@@ -77,6 +79,8 @@
     force: true
 
 - name: create overcloud update converge script
+  vars:
+    old_img: "{{ working_dir }}/{{ container_registry_file }}"
   template:
     src: "overcloud_update_converge.sh.j2"
     dest: "{{ overcloud_update_converge_script }}"

templates/overcloud_update_converge.sh.j2

@@ -29,7 +29,7 @@ openstack overcloud update converge \
     -n {{ network_data_file }} \
     {% endif -%}
     {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
-    {% for _env in initial_env_file.stdout_lines -%}
+    {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
         -e {{ _env }} \
     {% endfor -%}
     {% endif -%}
@@ -42,4 +42,4 @@ openstack overcloud update converge \
     {% if roles_data != default_roles_data -%}
     --roles-file {{ roles_data }} \
     {% endif -%}
-    -e {{ working_dir }}/{{ container_registry_file }} 2>&1
+    2>&1

templates/overcloud_update_prepare.sh.j2

@@ -26,7 +26,7 @@ openstack overcloud update prepare --templates {{ tht_directory }} \
     -n {{ network_data_file }} \
     {% endif -%}
     {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
-    {% for _env in initial_env_file.stdout_lines -%}
+    {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
         -e {{ _env }} \
     {% endfor -%}
     {% endif -%}
@@ -39,4 +39,4 @@ openstack overcloud update prepare --templates {{ tht_directory }} \
     {% if roles_data != default_roles_data -%}
     --roles-file {{ roles_data }} \
     {% endif -%}
-    -e {{ working_dir }}/{{ container_registry_file }} 2>&1
+    2>&1