Revert "Filter image list by deployed services"

This reverts commit e7c7570e72.

This change breaks containerised scenarios since the attempt to set the scenario environment in the prepare command is not sticking

Change-Id: I271a0c4c9323f9d1145dc0b4a9a5eaacd0acb97b

roles/extras-common/README.md

@@ -33,5 +33,3 @@ Role Variables
   docker images used for TripleO deployment
 - `docker_image_tag`: <'latest'> -- tag of docker images used for
   TripleO deployment
-- `deploy_composable_scenario`: <false> -- whether to deploy one of the
-  composable scenarios

roles/extras-common/defaults/main.yml

@@ -21,4 +21,3 @@ timestamper_cmd: >-
 # enable_libvirt_tripleo_ui is a switch to force the steps to run with or
 # without virtbmc
 enable_libvirt_tripleo_ui: false
-deploy_composable_scenario: false

roles/overcloud-prep-containers/README.md

@@ -29,7 +29,6 @@ overcloud-prep-containers variables
 * overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
 * overcloud_prep_containers_log: overcloud_prep_containers.log
 * undercloud_network_cidr: 192.168.24.0/24
-* prepare_service_env_args: -e {{ overcloud_templates_path }}/environments/docker.yaml
 
 overcloud-prep-config variables
 -------------------------------

roles/overcloud-prep-containers/defaults/main.yml

@@ -8,4 +8,3 @@ overcloud_prep_containers_log: overcloud_prep_containers.log
 # Useful in CI to workaround disk space issue
 # https://bugs.launchpad.net/tripleo/+bug/1694709
 delete_docker_cache: false
-prepare_service_env_args: -e {{ overcloud_templates_path }}/environments/docker.yaml

roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml

@@ -1,11 +1,4 @@
 ---
-- name: set the service environments for container image prepare
-  set_fact:
-    prepare_service_env_args: >-
-      -e {{ overcloud_templates_path }}/environments/docker.yaml
-      -e {{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}
-  when: deploy_composable_scenario|bool
-
 - name: Prepare for the containerized deployment
   shell: >
     set -o pipefail &&

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

@@ -17,7 +17,6 @@ set -eux
 
 openstack overcloud container image prepare \
     --images-file {{ working_dir }}/overcloud_containers.yaml \
-    {{ prepare_service_env_args }} \
     --namespace {{ docker_registry_namespace }} \
     --tag {{ docker_image_tag }} \
     --pull-source {{ docker_registry_host }} \
@@ -41,7 +40,6 @@ sudo systemctl start docker
 
 openstack overcloud container image prepare \
     --env-file {{ working_dir }}/containers-default-parameters.yaml \
-    {{ prepare_service_env_args }} \
     --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
     --tag {{ docker_image_tag }}
 

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

@@ -16,14 +16,12 @@ source {{ upgrade_working_dir }}/stackrc
 # pull latest containers to the registry
 openstack overcloud container image prepare \
     --images-file {{ upgrade_working_dir }}/overcloud_upgrade_containers.yaml \
-    -e {{ tht_dir }}/environments/docker.yaml \
     --namespace {{ docker_registry_namespace }} \
     --tag {{ docker_image_tag }} \
     --push-destination {{ local_docker_registry_host }}:8787
 
 openstack overcloud container image prepare \
     --env-file ~/containers-default-parameters.yaml \
-    -e {{ tht_dir }}/environments/docker.yaml \
     --namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
     --tag {{ docker_image_tag }}
 

roles/undercloud-deploy/templates/undercloud-deploy.sh.j2

@@ -78,12 +78,6 @@ sudo ln -f -s /usr/share/openstack-puppet/modules/* /etc/puppet/modules/
 {% if undercloud_docker_registry_host is defined %}
 openstack overcloud container image prepare \
     --env-file {{ working_dir }}/undercloud-containers-default-parameters.yaml \
-{% if containerized_undercloud|bool %}
-    -e {{overcloud_templates_path}}/environments/services-docker/ironic.yaml \
-    -e {{overcloud_templates_path}}/environments/services-docker/mistral.yaml \
-    -e {{overcloud_templates_path}}/environments/services-docker/zaqar.yaml \
-    -e {{overcloud_templates_path}}/environments/docker.yaml \
-{% endif %}
     --namespace {{ undercloud_docker_registry_host }}:{{ undercloud_docker_registry_port }}/{{ undercloud_docker_registry_namespace }}
 {% if undercloud_docker_registry_insecure|bool %}
 echo "  DockerInsecureRegistryAddress: {{ undercloud_docker_registry_host }}:{{ undercloud_docker_registry_port }}" >> \