Merge "Remove --skip-nodes-and-networks"
This commit is contained in:
commit
03a2eef0a6
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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', '') }}
|
||||
|
|
Loading…
Reference in New Issue