openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Add tripleo_overcloud_deploy_skip_nodes_and_networks 

This parameter allows to toggle the --skip-nodes-and-networks parameter
for the deploy command.

This option is needed when you pre-provision nodes and networks before
actually deploying.

See https://review.opendev.org/c/openstack/tripleo-docs/+/804893 for
more details.

Change-Id: I61643093bd62843bcf034f7154af0d197e8663fe
This commit is contained in:
Cédric Jeanneret 2021-08-18 08:45:54 +02:00
parent 95c0c40cac
commit 37612c527c
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_overcloud_deploy/README.md
View File

@ -51,6 +51,7 @@ Role Variables
* `tripleo_overcloud_deploy_roles_file`: (String) File path to a deployment roles file.
* `tripleo_overcloud_deploy_run_validations`: (Boolean) Flag to enable running validations. Default: false
* `tripleo_overcloud_deploy_skip_deploy_identifier`: (Boolean) Flag to enable skip deploy identifier. Default: false
* `tripleo_overcloud_deploy_skip_nodes_and_networks`: (Boolean) Flag to enable skip nodes and networks provisionning. Default: false
* `tripleo_overcloud_deploy_skip_postconfig`: (Boolean) Flag to enable skip postconfig. Default: false
* `tripleo_overcloud_deploy_stack`: (String) Name of the stack to deploy. Default: overcloud
* `tripleo_overcloud_deploy_templates`: (String) Path to a directory containing the tripleo-heat-templates for the deployment. Default: /usr/share/openstack-tripleo-heat-templates/

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

@ -41,6 +41,7 @@ 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

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

@ -337,6 +337,20 @@
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"

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

@ -31,6 +31,7 @@
{{ 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', '') }}