Do not hard-code overcloud-full image name

The var overcloud_image defaults to overcloud-full, and will until the
switchover to the whole-disk overcloud.

Change-Id: I64c0d9f97b34e9145be70af7c489bb5b706baf8a
Blueprint: whole-disk-default

config/environments/ovb-common.yml

@@ -39,7 +39,7 @@ external_interface_netmask: 255.255.255.0
 
 # images to copy to the undercloud
 images:
-  - name: overcloud-full
+  - name: "{{ overcloud_image }}"
     url: "{{ overcloud_image_url }}"
     type: tar
   - name: ipa_images

playbooks/baremetal-prep-virthost.yml

@@ -158,7 +158,7 @@
     - include_role:
         name: repo-setup
       vars:
-        repo_inject_image_path: "/home/{{ undercloud_user }}/overcloud-full.qcow2"
+        repo_inject_image_path: "/home/{{ undercloud_user }}/{{ overcloud_image }}.qcow2"
         repo_run_live: false
       when: not to_build|bool
 
@@ -174,7 +174,7 @@
     - include_role:
         name: install-built-repo
       vars:
-        ib_repo_image_path: "/home/{{ undercloud_user }}/overcloud-full.qcow2"
+        ib_repo_image_path: "/home/{{ undercloud_user }}/{{ overcloud_image }}.qcow2"
       when: compressed_gating_repo is defined and not to_build|bool
 
     - include_role:

playbooks/baremetal-undercloud-minimal.yml

@@ -77,7 +77,7 @@
     - {role: fetch-images,
        when: not to_build|bool}
     - {role: repo-setup,
-       repo_inject_image_path: "$HOME/overcloud-full.qcow2",
+       repo_inject_image_path: "$HOME/{{ overcloud_image }}.qcow2",
        repo_run_live: false,
        when: not to_build|bool}
     - {role: repo-setup,
@@ -87,7 +87,7 @@
        libguestfs_mode: false,
        when: not to_build|bool}
     - {role: install-built-repo,
-       ib_repo_image_path: "$HOME/overcloud-full.qcow2",
+       ib_repo_image_path: "$HOME/{{ overcloud_image }}.qcow2",
        when: compressed_gating_repo is defined and not to_build|bool}
     - {role: install-built-repo,
        ib_repo_image_path: "$HOME/ironic-python-agent.initramfs",

playbooks/ovb-setup.yml

@@ -59,7 +59,7 @@
     - {role: fetch-images,
        when: not to_build|bool}
     - {role: repo-setup,
-       repo_inject_image_path: "$HOME/overcloud-full.qcow2",
+       repo_inject_image_path: "$HOME/{{ overcloud_image }}.qcow2",
        repo_run_live: false,
        when: not to_build|bool}
     - {role: repo-setup,
@@ -69,7 +69,7 @@
        libguestfs_mode: false,
        when: not to_build|bool}
     - {role: install-built-repo,
-       ib_repo_image_path: "$HOME/overcloud-full.qcow2",
+       ib_repo_image_path: "$HOME/{{ overcloud_image }}.qcow2",
        when: compressed_gating_repo is defined and not to_build|bool}
     - {role: install-built-repo,
        ib_repo_image_path: "$HOME/ironic-python-agent.initramfs",

roles/build-images/README.md

@@ -7,8 +7,8 @@ environment inside of a libvirt guest using libguestfs-tools (isolated).
 
 It starts by creating the overcloud images from the provided yaml files. It
 then uses the convert-image role from tripleo-quickstart to turn the
-overcloud-full.qcow2 image into an undercloud image. Finally, it injects the
-previously created overcloud-full and ironic-python-agent images into this
+qcow2 image into an undercloud image. Finally, it injects the
+previously created overcloud image and ironic-python-agent images into this
 new undercloud image.
 
 Requirements

roles/install-built-repo/README.md

@@ -46,7 +46,7 @@ Including an example of how to use this role
       gather_facts: false
       vars:
         ib_repo_image_inject: true
-        ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2"
+        ib_repo_image_path: "{{ working_dir }}/{{ overcloud_image }}.qcow2"
       roles:
         - install-built-repo
 

roles/install-built-repo/defaults/main.yml

@@ -5,7 +5,7 @@ ib_repo_install_log: "{{ ib_repo_workdir }}/install_built_repo.log"
 ib_repo_run_live: true
 ib_repo_file_path: "{{ ib_repo_workdir }}/gating_repo.tar.gz"
 ib_repo_image_inject: false
-ib_repo_image_path: "{{ ib_repo_workdir }}/overcloud-full.qcow2"
+ib_repo_image_path: "{{ ib_repo_workdir }}/{{ overcloud_image }}.qcow2"
 ib_gating_repo_enabled: true
 ib_gating_repo_update: true
 ib_create_web_repo: "{{ job.provider_job | default(false) }}"

roles/overcloud-prep-images/templates/overcloud-glance-image-upload.sh.j2

@@ -18,11 +18,11 @@ source {{ working_dir }}/stackrc
 ## ::
 
 rpm -q qemu-img || sudo {{ ansible_pkg_mgr }} install -y qemu-img
-qemu-img create -f qcow2 overcloud-full.qcow2 1G
+qemu-img create -f qcow2 {{ overcloud_image }}.qcow2 1G
 
 glance image-create --container-format bare \
     --disk-format qcow2 \
-    --name overcloud-full \
-    --file overcloud-full.qcow2
+    --name {{ overcloud_image }} \
+    --file {{ overcloud_image }}.qcow2
 
 ### --stop_docs