Merge "Add '--vip-file' to overcloud deploy"

roles/tripleo_overcloud_deploy/README.md

@@ -33,6 +33,7 @@ Role Variables
 * `tripleo_overcloud_deploy_log_combine`: (Boolean) Flag to enable capturing stderr with stdout. Default: true
 * `tripleo_overcloud_deploy_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true
 * `tripleo_overcloud_deploy_networks_file`: (String) File path to a networks file for the deployment.
+* `tripleo_overcloud_deploy_vip_file`: (String) File path to a virtual IPs file for the deployment.
 * `tripleo_overcloud_deploy_no_cleanup`: (Boolean) String to enable no cleanup. Default: false
 * `tripleo_overcloud_deploy_no_config_download`: (Boolean) String to disable the config download software configuration. Default: false
 * `tripleo_overcloud_deploy_no_proxy`: (String) String containing a comma separated list of hosts to skip proxying when http_proxy and https_proxy are used.

roles/tripleo_overcloud_deploy/defaults/main.yml

@@ -23,6 +23,7 @@ tripleo_overcloud_deploy_log: "{{ tripleo_overcloud_deploy_home_dir }}/overcloud
 tripleo_overcloud_deploy_log_combine: true
 tripleo_overcloud_deploy_log_output: true
 tripleo_overcloud_deploy_networks_file:
+tripleo_overcloud_deploy_vip_file:
 tripleo_overcloud_deploy_no_cleanup: false
 tripleo_overcloud_deploy_no_config_download: false
 tripleo_overcloud_deploy_no_proxy:

roles/tripleo_overcloud_deploy/molecule/default/converge.yml

@@ -504,3 +504,17 @@
       assert:
         that:
           - tripleo_overcloud_deploy_output == "overcloud deploy --baremetal-deployment bare.yaml"
+
+    - name: Check parameter "tripleo_overcloud_deploy_vip_file"
+      include_role:
+        name: "tripleo_overcloud_deploy"
+      vars:
+        tripleo_overcloud_deploy_stack:
+        tripleo_overcloud_deploy_templates:
+        tripleo_overcloud_deploy_timeout_arg:
+        tripleo_overcloud_deploy_vip_file: vips.yaml
+
+    - name: Assert "tripleo_overcloud_deploy_vip_file"
+      assert:
+        that:
+          - tripleo_overcloud_deploy_output == "overcloud deploy --vip-file vips.yaml"

roles/tripleo_overcloud_deploy/tasks/main.yml

@@ -20,6 +20,7 @@
       {{ tripleo_overcloud_deploy_environment_dirs | tripleo.operator.shell_arg_list(parameter='--environment-directory') }}
       {{ tripleo_overcloud_deploy_roles_file | ternary('-r $DEPLOY_ROLES_FILE', '') }}
       {{ tripleo_overcloud_deploy_networks_file | ternary('-n $DEPLOY_NETWORKS_FILE', '') }}
+      {{ tripleo_overcloud_deploy_vip_file | ternary('--vip-file $DEPLOY_VIP_FILE', '') }}
       {{ tripleo_overcloud_deploy_plan_environment_file | ternary('-p $DEPLOY_PLAN_ENV_FILE', '') }}
       {{ tripleo_overcloud_deploy_no_cleanup | ternary('--no-cleanup', '') }}
       {{ tripleo_overcloud_deploy_validation_errors_nonfatal | ternary('--validation-errors-nonfatal', '') }}
@@ -58,6 +59,7 @@
       DEPLOY_OVERCLOUD_SSH_PORT_TIMEOUT: "{{ tripleo_overcloud_deploy_overcloud_ssh_port_timeout }}"
       DEPLOY_ROLES_FILE: "{{ tripleo_overcloud_deploy_roles_file }}"
       DEPLOY_NETWORKS_FILE: "{{ tripleo_overcloud_deploy_networks_file }}"
+      DEPLOY_VIP_FILE: "{{ tripleo_overcloud_deploy_vip_file }}"
       DEPLOY_PLAN_ENV_FILE: "{{ tripleo_overcloud_deploy_plan_environment_file }}"
       DEPLOY_ANSWERS_FILE: "{{ tripleo_overcloud_deploy_answers_file }}"
       DEPLOY_OUTPUT_DIR: "{{ tripleo_overcloud_deploy_output_dir }}"