diff --git a/roles/tripleo_overcloud_node_delete/README.md b/roles/tripleo_overcloud_node_delete/README.md new file mode 100644 index 0000000..f2745b9 --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/README.md @@ -0,0 +1,62 @@ +tripleo_overcloud_node_delete +======================== + +A role to run node delete. + +Requirements +------------ + +None. + +Role Variables +-------------- + +* `tripleo_overcloud_node_delete_nodes`: Node ID(s) to delete (otherwise specified in the --baremetal-deployment file) +* `tripleo_overcloud_node_delete_baremetal_deployment`: Configuration file describing the baremetal deployment +* `tripleo_overcloud_node_delete_stack`: Name or ID of heat stack to scale (default=Env: OVERCLOUD_STACK_NAME) +* `tripleo_overcloud_node_delete_templates`: The directory containing the Heat templates to deploy. + This argument is deprecated. The command now utilizes a deployment plan, which should be updated prior to running this + command, should that be required. Otherwise this argument will be silently ignored. +* `tripleo_overcloud_node_delete_environment_file`: Environment files to be passed to the heat stack-create or heat stack-update command. + (Can be specified more than once.) This argument is deprecated. The command now utilizes a deployment plan, + which should be updated prior to running this command, should that be required. Otherwise this argument will be silently ignored. +* `tripleo_overcloud_node_delete_timeout`: Timeout in minutes to wait for the nodes to be deleted. + Keep in mind that due to keystone session duration that timeout has an upper bound of 4 hours +* `tripleo_overcloud_node_delete_yes`: Skip yes/no prompt (assume yes) +* `tripleo_overcloud_node_delete_os_cloud`: (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_delete_rc_file`. +* `tripleo_overcloud_node_delete_rc_file`: (String) Path to the credential file to use. If `tripleo_rc_file` is defined, it will be the default. Default: "{{ ansible_env.HOME }}/stackrc" + +NOTE: Please note that this command should be run against the undercloud so the +OS_CLOUD or rc file variables should be set to use the 'undercloud' when +calling this role. If you are not defining `tripleo_os_cloud` or `tripleo_rc_file`, +stackrc will be used by default. + +Output Variables +---------------- + +* `tripleo_overcloud_node_delete_output`: (String) The command standard output. +* `tripleo_overcloud_node_delete_result`: Ansible shell execution results + +Dependencies +------------ + +None. + +Example Playbook +---------------- + +Example overcloud node delete playbook + +```yaml +- hosts: undercloud + gather_facts: true + tasks: + - name: Delete node + import_role: + name: tripleo_overcloud_node_delete +``` + +License +------- + +Apache-2.0 diff --git a/roles/tripleo_overcloud_node_delete/defaults/main.yml b/roles/tripleo_overcloud_node_delete/defaults/main.yml new file mode 100644 index 0000000..c0687fa --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/defaults/main.yml @@ -0,0 +1,13 @@ +--- +# defaults file for tripleo_overcloud_node_delete +openstack_bin: openstack +tripleo_overcloud_node_delete_debug: false +tripleo_overcloud_node_delete_nodes: [] +tripleo_overcloud_node_delete_baremetal_deployment: +tripleo_overcloud_node_delete_stack: "{{ ansible_env.OVERCLOUD_STACK_NAME|default('') }}" +tripleo_overcloud_node_delete_templates: +tripleo_overcloud_node_delete_environment_file: +tripleo_overcloud_node_delete_timeout: +tripleo_overcloud_node_delete_yes: true +tripleo_overcloud_node_delete_os_cloud: "{{ tripleo_os_cloud | default('') }}" +tripleo_overcloud_node_delete_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" diff --git a/roles/tripleo_overcloud_node_delete/meta/main.yml b/roles/tripleo_overcloud_node_delete/meta/main.yml new file mode 100644 index 0000000..8d78ad5 --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/meta/main.yml @@ -0,0 +1,42 @@ +--- +# Copyright 2019 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + + +galaxy_info: + author: OpenStack + description: TripleO Operator Role -- tripleo_overcloud_node_delete + company: Red Hat + license: Apache-2.0 + min_ansible_version: 2.8 + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + platforms: + - name: CentOS + versions: + - 7 + - 8 + + galaxy_tags: + - tripleo + + +# List your role dependencies here, one per line. Be sure to remove the '[]' above, +# if you add dependencies to this list. +dependencies: [] diff --git a/roles/tripleo_overcloud_node_delete/molecule/default/converge.yml b/roles/tripleo_overcloud_node_delete/molecule/default/converge.yml new file mode 100644 index 0000000..f1fdaea --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/molecule/default/converge.yml @@ -0,0 +1,138 @@ +--- +- name: Converge + hosts: all + gather_facts: true + tasks: + + - name: "Include tripleo_overcloud_node_delete" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_overcloud_node_delete_debug: true + tripleo_os_cloud: undercloud + + - name: Check role + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_nodes" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_nodes: ['test1', 'test2'] + + - name: Assert "tripleo_overcloud_node_delete_nodes" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete test1 test2 --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_baremetal_deployment" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_baremetal_deployment: value + + - name: Assert "tripleo_overcloud_node_delete_baremetal_deployment" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --baremetal-deployment value --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_stack" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_stack: value + + - name: Assert "tripleo_overcloud_node_delete_stack" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --stack value --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_templates" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_templates: value + + - name: Assert "tripleo_overcloud_node_delete_templates" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --templates value --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_environment_file" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_environment_file: value + + - name: Assert "tripleo_overcloud_node_delete_environment_file" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --environment-file value --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_timeout" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_timeout: value + + - name: Assert "tripleo_overcloud_node_delete_timeout" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete --timeout value --yes" + + - name: Check parameter "tripleo_overcloud_node_delete_yes" + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_yes: false + + - name: Assert "tripleo_overcloud_node_delete_yes" + assert: + that: + - tripleo_overcloud_node_delete_output == "overcloud node delete" + + + - name: Check all parameters for role tripleo_overcloud_node_delete + include_role: + name: "tripleo_overcloud_node_delete" + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_node_delete_debug: true + tripleo_overcloud_node_delete_nodes: ['value1', 'value2'] + tripleo_overcloud_node_delete_baremetal_deployment: value + tripleo_overcloud_node_delete_stack: value + tripleo_overcloud_node_delete_templates: value + tripleo_overcloud_node_delete_environment_file: value + tripleo_overcloud_node_delete_timeout: value + tripleo_overcloud_node_delete_yes: true + + - name: Assert all parameters for role tripleo_overcloud_node_delete + assert: + that: + - tripleo_overcloud_node_delete_output == + "overcloud node delete value1 value2 --baremetal-deployment value --stack value --templates value --environment-file value --timeout value --yes" diff --git a/roles/tripleo_overcloud_node_delete/molecule/default/molecule.yml b/roles/tripleo_overcloud_node_delete/molecule/default/molecule.yml new file mode 100644 index 0000000..2841806 --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/molecule/default/molecule.yml @@ -0,0 +1,19 @@ +--- +driver: + name: delegated + options: + managed: false + ansible_connection_options: + ansible_connection: local +log: true +platforms: + - name: instance +provisioner: + name: ansible +scenario: + name: default + test_sequence: + - prepare + - syntax + - converge + - verify diff --git a/roles/tripleo_overcloud_node_delete/molecule/default/prepare.yml b/roles/tripleo_overcloud_node_delete/molecule/default/prepare.yml new file mode 100644 index 0000000..63bb6ab --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/molecule/default/prepare.yml @@ -0,0 +1,8 @@ +--- +- name: Prepare + hosts: all + tasks: + + - name: Include molecule prep + include_role: + name: test_molecule_prep diff --git a/roles/tripleo_overcloud_node_delete/tasks/main.yml b/roles/tripleo_overcloud_node_delete/tasks/main.yml new file mode 100644 index 0000000..dffe10e --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/tasks/main.yml @@ -0,0 +1,38 @@ +--- +# tasks file for tripleo_overcloud_node_delete +- name: Setup overcloud node delete command + set_fact: + _delete_cmd: >- + {{ tripleo_overcloud_node_delete_os_cloud | ternary('', "source " ~ tripleo_overcloud_node_delete_rc_file ~ "; ") }} + {{ openstack_bin }} overcloud node delete + {{ tripleo_overcloud_node_delete_nodes | join(' ') }} + {{ tripleo_overcloud_node_delete_baremetal_deployment | ternary('--baremetal-deployment ' ~ tripleo_overcloud_node_delete_baremetal_deployment, '') }} + {{ tripleo_overcloud_node_delete_stack | ternary('--stack ' ~ tripleo_overcloud_node_delete_stack, '') }} + {{ tripleo_overcloud_node_delete_templates | ternary('--templates ' ~ tripleo_overcloud_node_delete_templates, '') }} + {{ tripleo_overcloud_node_delete_environment_file | tripleo.operator.shell_arg_list('--environment-file') }} + {{ tripleo_overcloud_node_delete_timeout | ternary('--timeout ' ~ tripleo_overcloud_node_delete_timeout, '') }} + {{ tripleo_overcloud_node_delete_yes | ternary('--yes', '') }} + + _delete_env: + OS_CLOUD: "{{ tripleo_overcloud_node_delete_os_cloud }}" + +- name: Show debug information + when: tripleo_overcloud_node_delete_debug|bool + block: + - name: Show the node delete command + debug: + var: _delete_cmd + + - name: Show the node delete environment + debug: + var: _delete_env + +- name: Delete node + shell: "{{ _delete_cmd }}" # noqa 305 + environment: "{{ _delete_env }}" + register: tripleo_overcloud_node_delete_result + changed_when: true + +- name: Set output fact + set_fact: + tripleo_overcloud_node_delete_output: "{{ tripleo_overcloud_node_delete_result.stdout }}" diff --git a/roles/tripleo_overcloud_node_delete/tests/inventory b/roles/tripleo_overcloud_node_delete/tests/inventory new file mode 100644 index 0000000..2fbb50c --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/tests/inventory @@ -0,0 +1 @@ +localhost diff --git a/roles/tripleo_overcloud_node_delete/tests/test.yml b/roles/tripleo_overcloud_node_delete/tests/test.yml new file mode 100644 index 0000000..dffc51c --- /dev/null +++ b/roles/tripleo_overcloud_node_delete/tests/test.yml @@ -0,0 +1,4 @@ +--- +- hosts: localhost + roles: + - tripleo_overcloud_node_delete diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index f46e94b..00843b3 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -17,6 +17,7 @@ - tripleo-operator-molecule-tripleo_overcloud_failures - tripleo-operator-molecule-tripleo_overcloud_node_clean - tripleo-operator-molecule-tripleo_overcloud_node_configure + - tripleo-operator-molecule-tripleo_overcloud_node_delete - tripleo-operator-molecule-tripleo_overcloud_node_introspect - tripleo-operator-molecule-tripleo_overcloud_node_import - tripleo-operator-molecule-tripleo_undercloud_backup @@ -42,6 +43,7 @@ - tripleo-operator-molecule-tripleo_overcloud_failures - tripleo-operator-molecule-tripleo_overcloud_node_clean - tripleo-operator-molecule-tripleo_overcloud_node_configure + - tripleo-operator-molecule-tripleo_overcloud_node_delete - tripleo-operator-molecule-tripleo_overcloud_node_introspect - tripleo-operator-molecule-tripleo_overcloud_node_import - tripleo-operator-molecule-tripleo_undercloud_backup @@ -179,6 +181,14 @@ vars: tox_extra_args: tripleo_overcloud_node_clean +- job: + files: + - ^roles/tripleo_overcloud_node_delete/.* + name: tripleo-operator-molecule-tripleo_overcloud_node_delete + parent: tripleo-operator-molecule-base + vars: + tox_extra_args: tripleo_overcloud_node_delete + - job: files: - ^roles/tripleo_container_image_prepare/.*