diff --git a/roles/tripleo_overcloud_deploy/README.md b/roles/tripleo_overcloud_deploy/README.md index 42f2f63..6bbb2ae 100644 --- a/roles/tripleo_overcloud_deploy/README.md +++ b/roles/tripleo_overcloud_deploy/README.md @@ -19,6 +19,7 @@ Role Variables * `tripleo_overcloud_deploy_deployed_server`: (Boolean) Flag to use pre-provisioned nodes. Default: false * `tripleo_overcloud_deploy_deployment_python_interpreter`: (String) Path to a python interpreter for the deployment actions. * `tripleo_overcloud_deploy_disable_password_generation`: (Boolean) Flag to disable password generation. Default: false +* `tripleo_overcloud_deploy_disable_protected_resource_types`: (Boolean) Flag to disable protected resource types. * `tripleo_overcloud_deploy_disable_validations`: (Boolean) Flag to disable validations. Default: false * `tripleo_overcloud_deploy_dry_run`: (Boolean) Flag to enable dry run. Default: false * `tripleo_overcloud_deploy_environment_dirs`: (List) A list of directory paths containing environment files for the deployment. Should not be used with environment files. diff --git a/roles/tripleo_overcloud_deploy/defaults/main.yml b/roles/tripleo_overcloud_deploy/defaults/main.yml index 5692ad3..ffac358 100644 --- a/roles/tripleo_overcloud_deploy/defaults/main.yml +++ b/roles/tripleo_overcloud_deploy/defaults/main.yml @@ -9,6 +9,7 @@ tripleo_overcloud_deploy_debug: false tripleo_overcloud_deploy_deployed_server: false tripleo_overcloud_deploy_deployment_python_interpreter: tripleo_overcloud_deploy_disable_password_generation: false +tripleo_overcloud_deploy_disable_protected_resource_types: false tripleo_overcloud_deploy_disable_validations: false tripleo_overcloud_deploy_dry_run: false tripleo_overcloud_deploy_environment_dirs: [] diff --git a/roles/tripleo_overcloud_deploy/molecule/default/converge.yml b/roles/tripleo_overcloud_deploy/molecule/default/converge.yml index d2b6da9..dba2d4c 100644 --- a/roles/tripleo_overcloud_deploy/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_deploy/molecule/default/converge.yml @@ -574,3 +574,17 @@ assert: that: - tripleo_overcloud_deploy_output == "overcloud deploy --rm-heat" + + - name: Check parameter "tripleo_overcloud_deploy_disable_protected_resource_types" + include_role: + name: "tripleo_overcloud_deploy" + vars: + tripleo_overcloud_deploy_stack: + tripleo_overcloud_deploy_templates: + tripleo_overcloud_deploy_timeout_arg: + tripleo_overcloud_deploy_disable_protected_resource_types: true + + - name: Assert "tripleo_overcloud_deploy_disable_protected_resource_types" + assert: + that: + - tripleo_overcloud_deploy_output == "overcloud deploy --disable-protected-resource-types" diff --git a/roles/tripleo_overcloud_deploy/tasks/main.yml b/roles/tripleo_overcloud_deploy/tasks/main.yml index d661647..49f60b5 100644 --- a/roles/tripleo_overcloud_deploy/tasks/main.yml +++ b/roles/tripleo_overcloud_deploy/tasks/main.yml @@ -47,6 +47,7 @@ {{ tripleo_overcloud_deploy_heat_container_engine_image | ternary('--heat-container-engine-image $DEPLOY_HEAT_CONTAINER_ENGINE_IMAGE', '') }} {{ tripleo_overcloud_deploy_skip_heat_pull | ternary('--skip-heat-pull', '') }} {{ tripleo_overcloud_deploy_remove_heat | ternary('--rm-heat', '') }} + {{ tripleo_overcloud_deploy_disable_protected_resource_types | ternary('--disable-protected-resource-types', '') }} {{ tripleo_overcloud_deploy_log_output | ternary((">" ~ tripleo_overcloud_deploy_log), '') }} {{ tripleo_overcloud_deploy_log_combine | ternary("2>&1", '') }} _deploy_env: