openstack/tripleo-operator-ansible
Code Issues Proposed changes

Remove --skip-nodes-and-networks

Browse Source 
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
This commit is contained in:
Harald Jensås 2021-10-08 09:44:06 +02:00
parent b0afe02676
commit 80b194a0b9
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_overcloud_deploy/defaults/main.yml
View File

@ -42,7 +42,6 @@ tripleo_overcloud_deploy_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME
tripleo_overcloud_deploy_roles_file: tripleo_overcloud_deploy_roles_file:
tripleo_overcloud_deploy_run_validations: false tripleo_overcloud_deploy_run_validations: false
tripleo_overcloud_deploy_skip_deploy_identifier: 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_skip_postconfig: false
tripleo_overcloud_deploy_stack: overcloud tripleo_overcloud_deploy_stack: overcloud
tripleo_overcloud_deploy_templates: /usr/share/openstack-tripleo-heat-templates tripleo_overcloud_deploy_templates: /usr/share/openstack-tripleo-heat-templates

14
roles/tripleo_overcloud_deploy/molecule/default/converge.yml
View File

@ -337,20 +337,6 @@
that: that:
- tripleo_overcloud_deploy_output == "overcloud deploy --skip-postconfig" - 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" - name: Check parameter "tripleo_overcloud_deploy_force_postconfig"
include_role: include_role:
name: "tripleo_overcloud_deploy" name: "tripleo_overcloud_deploy"

1
roles/tripleo_overcloud_deploy/tasks/main.yml
View File

@ -32,7 +32,6 @@
{{ tripleo_overcloud_deploy_skip_postconfig | ternary('--skip-postconfig', '') }} {{ tripleo_overcloud_deploy_skip_postconfig | ternary('--skip-postconfig', '') }}
{{ tripleo_overcloud_deploy_force_postconfig | ternary('--force-postconfig', '') }} {{ tripleo_overcloud_deploy_force_postconfig | ternary('--force-postconfig', '') }}
{{ tripleo_overcloud_deploy_skip_deploy_identifier | ternary('--skip-deploy-identifier', '') }} {{ 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_answers_file | ternary('--answers-file $DEPLOY_ANSWERS_FILE', '') }}
{{ tripleo_overcloud_deploy_disable_password_generation | ternary('--disable-password-generation', '') }} {{ tripleo_overcloud_deploy_disable_password_generation | ternary('--disable-password-generation', '') }}
{{ tripleo_overcloud_deploy_deployed_server | ternary('--deployed-server', '') }} {{ tripleo_overcloud_deploy_deployed_server | ternary('--deployed-server', '') }}