Fix some bad variable renames

When I created this role, we had some wrong substitutions.

Change-Id: I0c1d8f552644b64c749193ed5b544d5a8fb9624c

roles/tripleo_overcloud_update_prepare/defaults/main.yml

@@ -2,7 +2,7 @@
 # defaults file for tripleo_overcloud_update_prepare
 openstack_bin: openstack
 tripleo_overcloud_update_prepare_answers_file:
-tripleo_overcloud_update_prepare_baremetal_update_preparement:
+tripleo_overcloud_update_prepare_baremetal_deployment:
 tripleo_overcloud_update_prepare_config_download: false
 tripleo_overcloud_update_prepare_config_download_timeout:
 tripleo_overcloud_update_prepare_debug: false
@@ -38,7 +38,7 @@ tripleo_overcloud_update_prepare_poll: 10
 tripleo_overcloud_update_prepare_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}"
 tripleo_overcloud_update_prepare_roles_file:
 tripleo_overcloud_update_prepare_run_validations: false
-tripleo_overcloud_update_prepare_skip_update_prepare_identifier: false
+tripleo_overcloud_update_prepare_skip_deploy_identifier: false
 tripleo_overcloud_update_prepare_skip_postconfig: false
 tripleo_overcloud_update_prepare_stack: overcloud
 tripleo_overcloud_update_prepare_templates: /usr/share/openstack-tripleo-heat-templates

roles/tripleo_overcloud_update_prepare/molecule/default/converge.yml

@@ -332,6 +332,20 @@
         that:
           - tripleo_overcloud_update_prepare_output == "overcloud update prepare --skip-postconfig"
 
+    - name: Check parameter "tripleo_overcloud_update_prepare_skip_deploy_identifier"
+      include_role:
+        name: "tripleo_overcloud_update_prepare"
+      vars:
+        tripleo_overcloud_update_prepare_stack:
+        tripleo_overcloud_update_prepare_templates:
+        tripleo_overcloud_update_prepare_timeout_arg:
+        tripleo_overcloud_update_prepare_skip_deploy_identifier: true
+
+    - name: Assert "tripleo_overcloud_update_prepare_skip_deploy_identifier"
+      assert:
+        that:
+          - tripleo_overcloud_update_prepare_output == "overcloud update prepare --skip-deploy-identifier"
+
     - name: Check parameter "tripleo_overcloud_update_prepare_force_postconfig"
       include_role:
         name: "tripleo_overcloud_update_prepare"
@@ -472,16 +486,16 @@
         that:
           - tripleo_overcloud_update_prepare_output == "overcloud update prepare --deployment-python-interpreter python3"
 
-    - name: Check parameter "tripleo_overcloud_update_prepare_baremetal_update_preparement"
+    - name: Check parameter "tripleo_overcloud_update_prepare_baremetal_deployment"
       include_role:
         name: "tripleo_overcloud_update_prepare"
       vars:
         tripleo_overcloud_update_prepare_stack:
         tripleo_overcloud_update_prepare_templates:
         tripleo_overcloud_update_prepare_timeout_arg:
-        tripleo_overcloud_update_prepare_baremetal_update_preparement: bare.yaml
+        tripleo_overcloud_update_prepare_baremetal_deployment: bare.yaml
 
-    - name: Assert "tripleo_overcloud_update_prepare_baremetal_update_preparement"
+    - name: Assert "tripleo_overcloud_update_prepare_baremetal_deployment"
       assert:
         that:
           - tripleo_overcloud_update_prepare_output == "overcloud update prepare --baremetal-deployment bare.yaml"

roles/tripleo_overcloud_update_prepare/tasks/main.yml

@@ -31,7 +31,7 @@
       {{ tripleo_overcloud_update_prepare_run_validations | ternary('--run-validations', '') }}
       {{ tripleo_overcloud_update_prepare_skip_postconfig | ternary('--skip-postconfig', '') }}
       {{ tripleo_overcloud_update_prepare_force_postconfig | ternary('--force-postconfig', '') }}
-      {{ tripleo_overcloud_update_prepare_skip_update_prepare_identifier | ternary('--skip-deploy-identifier', '') }}
+      {{ tripleo_overcloud_update_prepare_skip_deploy_identifier | ternary('--skip-deploy-identifier', '') }}
       {{ tripleo_overcloud_update_prepare_answers_file | ternary('--answers-file $UPDATE_ANSWERS_FILE', '') }}
       {{ tripleo_overcloud_update_prepare_disable_password_generation | ternary('--disable-password-generation', '') }}
       {{ tripleo_overcloud_update_prepare_update_prepareed_server | ternary('--deployed-server', '') }}
@@ -41,7 +41,7 @@
       {{ tripleo_overcloud_update_prepare_override_ansible_cfg | ternary('--override-ansible-cfg $UPDATE_OVERRIDE_ANSIBLE_CFG', '') }}
       {{ tripleo_overcloud_update_prepare_config_download_timeout | ternary('--config-download-timeout $UPDATE_CONFIG_DOWNLOAD_TIMEOUT', '') }}
       {{ tripleo_overcloud_update_prepare_update_preparement_python_interpreter | ternary('--deployment-python-interpreter $UPDATE_PYTHON_INTERPRETER', '') }}
-      {{ tripleo_overcloud_update_prepare_baremetal_update_preparement | ternary('--baremetal-deployment $UPDATE_BAREMETAL_DEPLOYMENT', '') }}
+      {{ tripleo_overcloud_update_prepare_baremetal_deployment | ternary('--baremetal-deployment $UPDATE_BAREMETAL_DEPLOYMENT', '') }}
       {{ tripleo_overcloud_update_prepare_log_output | ternary((">" ~ tripleo_overcloud_update_prepare_log), '') }}
       {{ tripleo_overcloud_update_prepare_log_combine | ternary("2>&1", '') }}
     _update_prepare_env:
@@ -64,7 +64,7 @@
       UPDATE_OVERRIDE_ANSIBLE_CFG: "{{ tripleo_overcloud_update_prepare_override_ansible_cfg }}"
       UPDATE_CONFIG_DOWNLOAD_TIMEOUT: "{{ tripleo_overcloud_update_prepare_config_download_timeout }}"
       UPDATE_PYTHON_INTERPRETER: "{{ tripleo_overcloud_update_prepare_update_preparement_python_interpreter }}"
-      UPDATE_BAREMETAL_DEPLOYMENT: "{{ tripleo_overcloud_update_prepare_baremetal_update_preparement }}"
+      UPDATE_BAREMETAL_DEPLOYMENT: "{{ tripleo_overcloud_update_prepare_baremetal_deployment }}"
       OS_CLOUD: "{{ tripleo_overcloud_update_prepare_os_cloud }}"
 
 - name: Preserve existing log file if exists