Merge "Remove --old-deploy-image var for image upload"

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

@@ -33,7 +33,6 @@ step_introspect_debug_tcpdump_ports:
   - 69
   - 623
 step_introspect_with_retry: false
-bash_deploy_ramdisk: false
 step_install_undercloud: true
 step_root_device_size: false
 disk_root_device_size: 1843

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

@@ -26,9 +26,6 @@ openstack overcloud image upload
 {%- if containerized_undercloud|bool %}
     --http-boot=/var/lib/ironic/httpboot
 {%- endif %}
-{%- if bash_deploy_ramdisk|bool %}
-    --old-deploy-image
-{%- endif %}
 {%- if whole_disk_images|bool %}
     --whole-disk
 {%- endif %}

roles/undercloud-deploy/README.md

@@ -31,8 +31,6 @@ the source template for hieradata overrides for heat driven containerized underc
 for ironic deploy
 - `enable_vbmc`: <'true'> use a virtual bmc instead of pxe ssh
 - `step_introspect`: <'false'> -- boolean value to enable/disable ironic introspection
-- `bash_deploy_ramdisk`: <'false'> -- the variable allows older versions of tripleo to upload images
-properly with the option --old-deploy-image
 - `step_install_undercloud`: <'true'> -- turn on/off the undercloud deployment
 - `libvirt_uri`: <'qemu:///session'> -- the URI used by libvirt, by default tripleo-quickstart uses
 user sessions to provide greater flexixiblity to our users. ** additional documentation ** is at

roles/undercloud-deploy/defaults/main.yml

@@ -18,7 +18,6 @@ hieradata_override_file_classic_undercloud: hieradata-overrides-classic-underclo
 hieradata_override_file_t_h_t_undercloud: hieradata-overrides-t-h-t-undercloud.yaml.j2
 
 step_introspect: false
-bash_deploy_ramdisk: false
 step_install_undercloud: true
 
 # The TripleO-UI is available on the undercloud