Run "overcloud container image prepare" only once

Thanks to the fix for bug #1738663 it is no longer necessary to run
prepare separately to generate the environment file and the images
file. The second run only occurs now for ocata, pike runs.

Change-Id: I54a08d696ba7f67caa114a2beffe5de601eb1a92
Related-Bug: #1738663

roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2

@@ -46,11 +46,13 @@ BUILD_ID={{ docker_image_tag }}
 
 PREPARE_ARGS=${PREPARE_ARGS:-"{{ prepare_service_env_args }}"}
 
-## * Populate the docker registry
+## * Configure the {{ working_dir }}/containers-default-parameters.yaml, and
+##   populate the docker registry. This is done automatically.
 ## ::
 
 openstack overcloud container image prepare \
     --images-file {{ working_dir }}/overcloud_containers.yaml \
+    --env-file {{ working_dir }}/containers-default-parameters.yaml \
     ${PREPARE_ARGS} \
     --namespace {{ docker_registry_host }}/{{ docker_registry_namespace_used }} \
     --tag $BUILD_ID \
@@ -73,28 +75,32 @@ openstack overcloud container image prepare \
 
 openstack overcloud container image upload --debug --config-file {{ working_dir }}/overcloud_containers.yaml
 
-## * Configure the {{ working_dir }}/containers-default-parameters.yaml, this is done automatically.
+{% if release in ['ocata', 'pike'] %}
+## * Configure the {{ working_dir }}/containers-default-parameters.yaml to pull
+##   from a local registry, this is done automatically.
 ## ::
 
-openstack overcloud container image prepare \
-    --images-file {{ working_dir }}/overcloud_containers.yaml \
-    --env-file {{ working_dir }}/containers-default-parameters.yaml \
-    ${PREPARE_ARGS} \
-    --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace_used }} \
-    --set ceph_namespace={{ local_docker_registry_host }}:8787/ceph \
-{% if docker_prep_prefix is defined %}
-    --prefix={{ docker_prep_prefix}} \
+    openstack overcloud container image prepare \
+        --env-file {{ working_dir }}/containers-default-parameters.yaml \
+        ${PREPARE_ARGS} \
+        --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
+    {% if docker_prep_prefix is defined %}
+        --prefix={{ docker_prep_prefix}} \
+    {% endif %}
+    {% if docker_prep_suffix is defined %}
+        --suffix={{ docker_prep_suffix }} \
+    {% endif %}
+    {% if docker_ceph_namespace is defined %}
+        --set ceph_namespace={{ docker_ceph_namespace }} \
+    {% endif %}
+    {% if docker_ceph_image is defined %}
+        --set ceph_image={{ docker_ceph_image }} \
+    {% endif %}
+    {% if docker_ceph_tag is defined %}
+        --set ceph_tag={{ docker_ceph_tag }} \
+    {% endif %}
+        --tag $BUILD_ID
 {% endif %}
-{% if docker_prep_suffix is defined %}
-    --suffix={{ docker_prep_suffix }} \
-{% endif %}
-{% if docker_ceph_image is defined %}
-    --set ceph_image={{ docker_ceph_image }} \
-{% endif %}
-{% if docker_ceph_tag is defined %}
-    --set ceph_tag={{ docker_ceph_tag }} \
-{% endif %}
-    --tag $BUILD_ID
 
 {% if update_containers|bool and not use_overcloud_mixed_upgrade|default(false)|bool %}
 # See https://github.com/imain/container-check for script and documentation

roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2

@@ -15,7 +15,8 @@ source {{ upgrade_working_dir }}/stackrc
 {% if containerized_overcloud_upgrade_pull_images|bool %}
 # pull latest containers to the registry
 openstack overcloud container image prepare \
-    --images-file {{ upgrade_working_dir }}/overcloud_upgrade_containers.yaml \
+    --output-images-file {{ upgrade_working_dir }}/overcloud_upgrade_containers.yaml \
+    --output-env-file ~/containers-default-parameters.yaml \
     -e {{ tht_dir }}/environments/docker.yaml \
     {{ scenario_args }} \
 {% for item in upgrade_custom_templates %}
@@ -25,8 +26,15 @@ openstack overcloud container image prepare \
     --tag {{ docker_image_tag }} \
     --push-destination {{ local_docker_registry_host }}:8787
 
+openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_upgrade_containers.yaml
+
+{% endif %}
+
+{% if target_upgrade_version in ['pike'] %}
+
+# generate container image parameters to pull from local registry
 openstack overcloud container image prepare \
-    --env-file ~/containers-default-parameters.yaml \
+    --output-env-file ~/containers-default-parameters.yaml \
     -e {{ tht_dir }}/environments/docker.yaml \
     {{ scenario_args }} \
 {% for item in upgrade_custom_templates %}
@@ -35,12 +43,6 @@ openstack overcloud container image prepare \
     --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
     --tag {{ docker_image_tag }}
 
-openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_upgrade_containers.yaml
-
-{% endif %}
-
-{% if target_upgrade_version in ['pike'] %}
-
 echo "execute overcloud upgrade"
 openstack overcloud deploy --templates {{ tht_dir }} \
     {{ deploy_args_used }} \