From 80b194a0b9fa0c204142492308ae44b2b7a475ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 8 Oct 2021 09:44:06 +0200 Subject: [PATCH] Remove --skip-nodes-and-networks The depens-on removes the usage of --skip-nodes-and-networks, instead the existing --baremtal-deployment option is used to provide the capability to enable/disable "all-in-one" network+ node provisioning with overcloud deploy command. Depends-On: Idaab1f28c4d645279eff0c01b24435bf8571299b Change-Id: I97b8c8762524efbfc12533bbd557a689cff53273 --- roles/tripleo_overcloud_deploy/defaults/main.yml | 1 - .../molecule/default/converge.yml | 14 -------------- roles/tripleo_overcloud_deploy/tasks/main.yml | 1 - 3 files changed, 16 deletions(-) diff --git a/roles/tripleo_overcloud_deploy/defaults/main.yml b/roles/tripleo_overcloud_deploy/defaults/main.yml index 29b98d6..f916696 100644 --- a/roles/tripleo_overcloud_deploy/defaults/main.yml +++ b/roles/tripleo_overcloud_deploy/defaults/main.yml @@ -42,7 +42,6 @@ tripleo_overcloud_deploy_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME tripleo_overcloud_deploy_roles_file: tripleo_overcloud_deploy_run_validations: false tripleo_overcloud_deploy_skip_deploy_identifier: false -tripleo_overcloud_deploy_skip_nodes_and_networks: false tripleo_overcloud_deploy_skip_postconfig: false tripleo_overcloud_deploy_stack: overcloud tripleo_overcloud_deploy_templates: /usr/share/openstack-tripleo-heat-templates diff --git a/roles/tripleo_overcloud_deploy/molecule/default/converge.yml b/roles/tripleo_overcloud_deploy/molecule/default/converge.yml index 4f8fe50..972dac8 100644 --- a/roles/tripleo_overcloud_deploy/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_deploy/molecule/default/converge.yml @@ -337,20 +337,6 @@ that: - tripleo_overcloud_deploy_output == "overcloud deploy --skip-postconfig" - - name: Check parameter "tripleo_overcloud_deploy_skip_nodes_and_networks" - include_role: - name: "tripleo_overcloud_deploy" - vars: - tripleo_overcloud_deploy_stack: - tripleo_overcloud_deploy_templates: - tripleo_overcloud_deploy_timeout_arg: - tripleo_overcloud_deploy_skip_nodes_and_networks: true - - - name: Assert "tripleo_overcloud_deploy_skip_nodes_and_networks" - assert: - that: - - tripleo_overcloud_deploy_output == "overcloud deploy --skip-nodes-and-networks" - - name: Check parameter "tripleo_overcloud_deploy_force_postconfig" include_role: name: "tripleo_overcloud_deploy" diff --git a/roles/tripleo_overcloud_deploy/tasks/main.yml b/roles/tripleo_overcloud_deploy/tasks/main.yml index 58e6468..17f7c15 100644 --- a/roles/tripleo_overcloud_deploy/tasks/main.yml +++ b/roles/tripleo_overcloud_deploy/tasks/main.yml @@ -32,7 +32,6 @@ {{ tripleo_overcloud_deploy_skip_postconfig | ternary('--skip-postconfig', '') }} {{ tripleo_overcloud_deploy_force_postconfig | ternary('--force-postconfig', '') }} {{ tripleo_overcloud_deploy_skip_deploy_identifier | ternary('--skip-deploy-identifier', '') }} - {{ tripleo_overcloud_deploy_skip_nodes_and_networks | ternary('--skip-nodes-and-networks', '') }} {{ tripleo_overcloud_deploy_answers_file | ternary('--answers-file $DEPLOY_ANSWERS_FILE', '') }} {{ tripleo_overcloud_deploy_disable_password_generation | ternary('--disable-password-generation', '') }} {{ tripleo_overcloud_deploy_deployed_server | ternary('--deployed-server', '') }}