From 103eaf8322c1952dca3fd4615a939f856c51ec4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 8 Oct 2021 09:38:24 +0200 Subject: [PATCH] Remove use of --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: I00241ee91cee42770c67fa181482c6e6ad9dedf1 --- roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 index a72f9b2ec..9d0d5183c 100644 --- a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 +++ b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 @@ -18,7 +18,6 @@ source {{ working_dir }}/stackrc ## * Deploy the overcloud! ## :: openstack overcloud deploy --stack {{ stack_name }} \ - {% if network_provision|bool %}--skip-nodes-and-networks{% endif %} \ {% if release is not in ['newton', 'ocata', 'pike', 'queens'] %}--override-ansible-cfg {{ working_dir }}/custom_ansible.cfg{% endif %} \ --templates {{overcloud_templates_path}} \ {{ deploy_args | regex_replace("\n", " ") }} \