diff --git a/roles/tripleo_overcloud_network_vip_provision/README.md b/roles/tripleo_overcloud_network_vip_provision/README.md index 50fc9bb..7d9d2c6 100644 --- a/roles/tripleo_overcloud_network_vip_provision/README.md +++ b/roles/tripleo_overcloud_network_vip_provision/README.md @@ -21,7 +21,7 @@ Role Variables * `tripleo_overcloud_network_vip_provision_log`: (String) Path to a log file for the command output. Default: "{{ tripleo_overcloud_network_vip_provision_home_dir }}/overcloud_network_vip_provision.log" * `tripleo_overcloud_network_vip_provision_os_cloud`: (String) (String) OS_CLOUD value to use when running the command. If `tripleo_os_cloud` is defined, it will be the default. Otherwise the default is ''. This variable takes precedence over `tripleo_overcloud_network_vip_provision_rc_file`. * `tripleo_overcloud_network_vip_provision_output_file`: (String) Path to an output file. -* `tripleo_overcloud_network_vip_provision_stack`: (String) Stack name. +* `tripleo_overcloud_network_vip_provision_stack`: (String) Stack name. Defaut: overcloud * `tripleo_overcloud_network_vip_provision_rc_file`: (String) (String) Path to the credential file to use. If `tripleo_rc_file` is defined, it will be the default. Default: "{{ ansible_env.HOME }}/stackrc" Output Variables diff --git a/roles/tripleo_overcloud_network_vip_provision/defaults/main.yml b/roles/tripleo_overcloud_network_vip_provision/defaults/main.yml index 92f7235..d7419fe 100644 --- a/roles/tripleo_overcloud_network_vip_provision/defaults/main.yml +++ b/roles/tripleo_overcloud_network_vip_provision/defaults/main.yml @@ -11,5 +11,5 @@ tripleo_overcloud_network_vip_provision_log_combine: true tripleo_overcloud_network_vip_provision_log_output: true tripleo_overcloud_network_vip_provision_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_overcloud_network_vip_provision_output_file: -tripleo_overcloud_network_vip_provision_stack: +tripleo_overcloud_network_vip_provision_stack: overcloud tripleo_overcloud_network_vip_provision_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" diff --git a/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml b/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml index 5b930d1..7f8dcde 100644 --- a/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_network_vip_provision/molecule/default/converge.yml @@ -17,13 +17,14 @@ - name: Check role assert: that: - - tripleo_overcloud_network_vip_provision_output == "overcloud network vip provision -y" + - tripleo_overcloud_network_vip_provision_output == "overcloud network vip provision -y --stack overcloud" - name: Assert "tripleo_overcloud_network_vip_provision_output_file" include_role: name: "tripleo_overcloud_network_vip_provision" vars: tripleo_overcloud_network_vip_provision_output_file: foo.yaml + tripleo_overcloud_network_vip_provision_stack: - name: Validate tripleo_overcloud_network_vip_provision_output_file assert: @@ -36,6 +37,7 @@ name: "tripleo_overcloud_network_vip_provision" vars: tripleo_overcloud_network_vip_provision_deployment_file: deploy.yaml + tripleo_overcloud_network_vip_provision_stack: - name: Validate tripleo_overcloud_network_vip_provision_deployment_file assert: diff --git a/roles/tripleo_overcloud_node_extract_provisioned/defaults/main.yml b/roles/tripleo_overcloud_node_extract_provisioned/defaults/main.yml index 99895a1..6fb03a1 100644 --- a/roles/tripleo_overcloud_node_extract_provisioned/defaults/main.yml +++ b/roles/tripleo_overcloud_node_extract_provisioned/defaults/main.yml @@ -11,4 +11,4 @@ tripleo_overcloud_node_extract_provisioned_os_cloud: "{{ tripleo_os_cloud | defa tripleo_overcloud_node_extract_provisioned_output_file: tripleo_overcloud_node_extract_provisioned_overwrite_action: error tripleo_overcloud_node_extract_provisioned_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" -tripleo_overcloud_node_extract_provisioned_stack: +tripleo_overcloud_node_extract_provisioned_stack: overcloud diff --git a/roles/tripleo_overcloud_node_provision/README.md b/roles/tripleo_overcloud_node_provision/README.md index 398516f..63b7645 100644 --- a/roles/tripleo_overcloud_node_provision/README.md +++ b/roles/tripleo_overcloud_node_provision/README.md @@ -26,7 +26,7 @@ Role Variables * `tripleo_overcloud_node_provision_overcloud_ssh_user`: (String) User for ssh access to the newly deployed nodes. * `tripleo_overcloud_node_provision_poll`: (Integer) Number of seconds to wait between each checks to see if the command has completed. Default: 10 * `tripleo_overcloud_node_provision_rc_file`: (String) (String) Path to the credential file to use. If `tripleo_rc_file` is defined, it will be the default. Default: "{{ ansible_env.HOME }}/stackrc" -* `tripleo_overcloud_node_provision_stack`: (String) Name or ID of the heat stack. +* `tripleo_overcloud_node_provision_stack`: (String) Name or ID of the heat stack. Default: stack * `tripleo_overcloud_node_provision_timeout_arg`: (Integer) Number of seconds to wait for node to complete. Should be smaller than the `overcloud_node_provision_timeout` variable. * `tripleo_overcloud_node_provision_timeout`: (Integer) Number in seconds to wait for the ansible execution of the command to finish. Default: 3700 diff --git a/roles/tripleo_overcloud_node_provision/defaults/main.yml b/roles/tripleo_overcloud_node_provision/defaults/main.yml index fb07af6..10c75f6 100644 --- a/roles/tripleo_overcloud_node_provision/defaults/main.yml +++ b/roles/tripleo_overcloud_node_provision/defaults/main.yml @@ -16,7 +16,7 @@ tripleo_overcloud_node_provision_overcloud_ssh_key: tripleo_overcloud_node_provision_overcloud_ssh_user: tripleo_overcloud_node_provision_poll: 10 tripleo_overcloud_node_provision_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" -tripleo_overcloud_node_provision_stack: +tripleo_overcloud_node_provision_stack: overcloud tripleo_overcloud_node_provision_timeout: 3700 tripleo_overcloud_node_provision_timeout_arg: tripleo_overcloud_node_provision_network_ports: diff --git a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml index db295de..6b5fe2e 100644 --- a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml @@ -18,13 +18,14 @@ - name: Check role assert: that: - - tripleo_overcloud_node_provision_output == "overcloud node provision" + - tripleo_overcloud_node_provision_output == "overcloud node provision --stack overcloud" - name: Assert "tripleo_overcloud_node_provision_output_file" include_role: name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_output_file: foo.yaml + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_output_file assert: @@ -49,6 +50,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_overcloud_ssh_user: foo + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_overcloud_ssh_user assert: @@ -61,6 +63,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_overcloud_ssh_key: foo.pub + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_overcloud_ssh_key assert: @@ -73,6 +76,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_concurrency: 5 + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_concurrency assert: @@ -85,6 +89,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_timeout_arg: 12 + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_timeout_arg assert: @@ -97,6 +102,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_deployment_file: deploy.yaml + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_deployment_file assert: @@ -109,6 +115,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_network_ports: true + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_network_ports assert: @@ -121,6 +128,7 @@ name: "tripleo_overcloud_node_provision" vars: tripleo_overcloud_node_provision_network_config: true + tripleo_overcloud_node_provision_stack: - name: Validate tripleo_overcloud_node_provision_network_config assert: diff --git a/roles/tripleo_overcloud_node_unprovision/README.md b/roles/tripleo_overcloud_node_unprovision/README.md index 3bece8e..be27d01 100644 --- a/roles/tripleo_overcloud_node_unprovision/README.md +++ b/roles/tripleo_overcloud_node_unprovision/README.md @@ -23,7 +23,7 @@ Role Variables * `tripleo_overcloud_node_unprovision_os_cloud`: (String) (String) OS_CLOUD value to use when running the command. If `tripleo_os_cloud` is defined, it will be the default. Otherwise the default is ''. This variable takes precedence over `tripleo_overcloud_node_unprovision_rc_file`. * `tripleo_overcloud_node_unprovision_poll`: (Integer) Number of seconds to wait between each checks to see if the command has completed. Default: 10 * `tripleo_overcloud_node_unprovision_rc_file`: (String) (String) Path to the credential file to use. If `tripleo_rc_file` is defined, it will be the default. Default: "{{ ansible_env.HOME }}/stackrc" -* `tripleo_overcloud_node_unprovision_stack`: (String) Name or ID of the heat stack +* `tripleo_overcloud_node_unprovision_stack`: (String) Name or ID of the heat stack Default: overcloud * `tripleo_overcloud_node_unprovision_timeout`: (Integer) Number in seconds to wait for the ansible execution of the command to finish. Default: 3600 * `tripleo_overcloud_node_unprovision_yes`: (Boolean) Skip yes/no prompt. Default: true diff --git a/roles/tripleo_overcloud_node_unprovision/defaults/main.yml b/roles/tripleo_overcloud_node_unprovision/defaults/main.yml index 0079853..1cd260f 100644 --- a/roles/tripleo_overcloud_node_unprovision/defaults/main.yml +++ b/roles/tripleo_overcloud_node_unprovision/defaults/main.yml @@ -13,7 +13,7 @@ tripleo_overcloud_node_unprovision_log_output: true tripleo_overcloud_node_unprovision_os_cloud: "{{ tripleo_os_cloud | default('') }}" tripleo_overcloud_node_unprovision_poll: 10 tripleo_overcloud_node_unprovision_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" -tripleo_overcloud_node_unprovision_stack: +tripleo_overcloud_node_unprovision_stack: overcloud tripleo_overcloud_node_unprovision_timeout: 3600 tripleo_overcloud_node_unprovision_yes: true tripleo_overcloud_node_unprovision_network_ports: diff --git a/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml b/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml index 99f593b..0e2bb70 100644 --- a/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml @@ -18,7 +18,7 @@ - name: Check role assert: that: - - tripleo_overcloud_node_unprovision_output == "overcloud node unprovision --yes" + - tripleo_overcloud_node_unprovision_output == "overcloud node unprovision --stack overcloud --yes" - name: Assert "tripleo_overcloud_node_unprovision_stack" include_role: @@ -37,6 +37,7 @@ name: "tripleo_overcloud_node_unprovision" vars: tripleo_overcloud_node_unprovision_all: true + tripleo_overcloud_node_unprovision_stack: - name: Validate tripleo_overcloud_node_unprovision_all assert: @@ -49,6 +50,7 @@ name: "tripleo_overcloud_node_unprovision" vars: tripleo_overcloud_node_unprovision_deployment_file: foo.yaml + tripleo_overcloud_node_unprovision_stack: - name: Validate tripleo_overcloud_node_unprovision_deployment_file assert: @@ -61,6 +63,7 @@ name: "tripleo_overcloud_node_unprovision" vars: tripleo_overcloud_node_unprovision_network_ports: true + tripleo_overcloud_node_unprovision_stack: - name: Validate tripleo_overcloud_node_unprovision_network_ports assert: