From 227863875e026f8eeb02886e84d2446afd06f68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 8 Jun 2021 14:21:03 +0200 Subject: [PATCH] Add missing "vip" argument to the CLI Change-Id: I34aa7272ced03ee535a3a56428496195ad6a4d95 --- .../molecule/default/converge.yml | 4 ++-- roles/tripleo_overcloud_network_vip_provision/tasks/main.yml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml b/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml index 468f577..66fe18b 100644 --- a/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml @@ -17,7 +17,7 @@ - name: Check role assert: that: - - tripleo_overcloud_network_vip_provision_output == "overcloud network provision -y" + - tripleo_overcloud_network_vip_provision_output == "overcloud network vip provision -y" - name: Assert "tripleo_overcloud_network_vip_provision_output_file" include_role: @@ -29,7 +29,7 @@ assert: that: - tripleo_overcloud_network_vip_provision_output == - "overcloud network provision -o foo.yaml" + "overcloud network vip provision -o foo.yaml" - name: Assert "tripleo_overcloud_network_vip_provision_deployment_file" include_role: diff --git a/roles/tripleo_overcloud_network_vip_provision/tasks/main.yml b/roles/tripleo_overcloud_network_vip_provision/tasks/main.yml index 8daefcf..508d19f 100644 --- a/roles/tripleo_overcloud_network_vip_provision/tasks/main.yml +++ b/roles/tripleo_overcloud_network_vip_provision/tasks/main.yml @@ -1,10 +1,10 @@ --- # tasks file for tripleo_overcloud_network_vip_provision -- name: Set overcloud network provision facts +- name: Set overcloud network vip provision facts set_fact: _provision_cmd: >- {{ tripleo_overcloud_network_vip_provision_os_cloud | ternary('', "source " ~ tripleo_overcloud_network_vip_provision_rc_file ~ "; ") }} - {{ openstack_bin }} overcloud network provision -y + {{ openstack_bin }} overcloud network vip provision -y {{ tripleo_overcloud_network_vip_provision_output_file | ternary('-o $PROVISION_OUTPUT', '') }} {{ tripleo_overcloud_network_vip_provision_stack | ternary ('--stack $STACK', '') }} {{ tripleo_overcloud_network_vip_provision_deployment_file }} @@ -51,7 +51,6 @@ - not ansible_check_mode|bool - not tripleo_overcloud_network_vip_provision_generate_scripts_only|bool - - name: Set output fact when: - tripleo_overcloud_network_vip_provision_result.stdout is defined