From c4c3d1ef8465d27c9b8d1607ca9802b728938bb0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 24 Mar 2020 15:01:55 -0600 Subject: [PATCH] Add overcloud delete Adds tripleo_overcloud_delete for automating cloud deletion. Change-Id: Id706492026e0fca1571a5db80ac42d2cca8c4355 --- roles/tripleo_overcloud_delete/README.md | 57 +++++++++++++++++++ .../defaults/main.yml | 14 +++++ roles/tripleo_overcloud_delete/meta/main.yml | 42 ++++++++++++++ .../molecule/default/converge.yml | 44 ++++++++++++++ .../molecule/default/molecule.yml | 19 +++++++ .../molecule/default/prepare.yml | 8 +++ roles/tripleo_overcloud_delete/tasks/main.yml | 48 ++++++++++++++++ .../tripleo_overcloud_delete/tests/inventory | 1 + roles/tripleo_overcloud_delete/tests/test.yml | 5 ++ zuul.d/molecule.yaml | 16 ++++++ 10 files changed, 254 insertions(+) create mode 100644 roles/tripleo_overcloud_delete/README.md create mode 100644 roles/tripleo_overcloud_delete/defaults/main.yml create mode 100644 roles/tripleo_overcloud_delete/meta/main.yml create mode 100644 roles/tripleo_overcloud_delete/molecule/default/converge.yml create mode 100644 roles/tripleo_overcloud_delete/molecule/default/molecule.yml create mode 100644 roles/tripleo_overcloud_delete/molecule/default/prepare.yml create mode 100644 roles/tripleo_overcloud_delete/tasks/main.yml create mode 100644 roles/tripleo_overcloud_delete/tests/inventory create mode 100644 roles/tripleo_overcloud_delete/tests/test.yml diff --git a/roles/tripleo_overcloud_delete/README.md b/roles/tripleo_overcloud_delete/README.md new file mode 100644 index 0000000..85ba03b --- /dev/null +++ b/roles/tripleo_overcloud_delete/README.md @@ -0,0 +1,57 @@ +tripleo_overcloud_delete +========= + +A role to perform an overcloud delete. + +Requirements +------------ + +None. + +Role Variables +-------------- + +* `tripleo_overcloud_delete_debug`: (Boolean) Flag to print out the delete command. Default: False +* `tripleo_overcloud_delete_home_dir`: (String) Home directory to where the command is run from. Default: "{{ ansible_env.HOME }}" +* `tripleo_overcloud_delete_log_combine`: (Boolean) Flag to enable captching stderr with stdout. Default: true +* `tripleo_overcloud_delete_log_output`: (Boolean) Flag to enable logging to a file. Since the output of this command can be large, it is not recommended to disable this. Default: true +* `tripleo_overcloud_delete_log`: (String) Path to a log file for the command output. Default: "{{ tripleo_overcloud_delete_home_dir }}/overcloud_delete.log" +* `tripleo_overcloud_delete_name`: (String) REQUIRED. Name or ID of heat stack to delete. +* `tripleo_overcloud_delete_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_delete_rc_file`. +* `tripleo_overcloud_delete_poll`: (Integer) Number of seconds to wait between each checks to see if the command has completed. Default: 10 +* `tripleo_overcloud_delete_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_delete_timeout`: (Integer) Number in seconds to wait for the ansible execution of the command to finish. Default: 3600 +* `tripleo_overcloud_delete_yes`: (Boolean) Flag to indicate if we should prompt for yes/no. Default: false + +Output Variables +---------------- + +* `tripleo_overcloud_delete_output`: (String) The command standard output. +* `tripleo_overcloud_delete_result`: Ansible shell execution results + +Dependencies +------------ + +None. + +Example Playbook +---------------- + +Example overcloud delete playbook + +```yaml +- hosts: undercloud + gather_facts: true + tasks: + - name: Run overcloud delete + import_role: + name: tripleo_overcloud_delete + var: + tripleo_overcloud_delete_debug: true + tripleo_overcloud_delete_name: overcloud +``` + +License +------- + +Apache-2.0 diff --git a/roles/tripleo_overcloud_delete/defaults/main.yml b/roles/tripleo_overcloud_delete/defaults/main.yml new file mode 100644 index 0000000..24e2f65 --- /dev/null +++ b/roles/tripleo_overcloud_delete/defaults/main.yml @@ -0,0 +1,14 @@ +--- +# defaults file for tripleo_overcloud_delete +openstack_bin: openstack +tripleo_overcloud_delete_debug: false +tripleo_overcloud_delete_home_dir: "{{ ansible_env.HOME }}" +tripleo_overcloud_delete_log: "{{ tripleo_overcloud_delete_home_dir }}/overcloud_delete.log" +tripleo_overcloud_delete_log_combine: true +tripleo_overcloud_delete_log_output: true +tripleo_overcloud_delete_name: +tripleo_overcloud_delete_os_cloud: "{{ tripleo_os_cloud | default('') }}" +tripleo_overcloud_delete_poll: 10 +tripleo_overcloud_delete_rc_file: "{{ tripleo_rc_file | default(ansible_env.HOME ~ '/stackrc') }}" +tripleo_overcloud_delete_timeout: 3600 +tripleo_overcloud_delete_yes: true diff --git a/roles/tripleo_overcloud_delete/meta/main.yml b/roles/tripleo_overcloud_delete/meta/main.yml new file mode 100644 index 0000000..9cff58a --- /dev/null +++ b/roles/tripleo_overcloud_delete/meta/main.yml @@ -0,0 +1,42 @@ +--- +# Copyright 2020 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_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_delete/molecule/default/converge.yml b/roles/tripleo_overcloud_delete/molecule/default/converge.yml new file mode 100644 index 0000000..49edf53 --- /dev/null +++ b/roles/tripleo_overcloud_delete/molecule/default/converge.yml @@ -0,0 +1,44 @@ +--- +- name: Converge + hosts: all + collections: + - tripleo.operator + vars: + openstack_bin: echo + tripleo_os_cloud: undercloud + tripleo_overcloud_delete_yes: false + tripleo_overcloud_delete_log_output: false + tripleo_overcloud_delete_poll: 1 + tripleo_overcloud_delete_debug: true + tasks: + + - name: "Include tripleo_overcloud_delete" + include_role: + name: "tripleo_overcloud_delete" + + - name: Check role + assert: + that: + - tripleo_overcloud_delete_output == "overcloud delete" + + - name: Validate "tripleo_overcloud_delete_name" + include_role: + name: "tripleo_overcloud_delete" + vars: + tripleo_overcloud_delete_name: foo + + - name: Assert tripleo_overcloud_delete_name + assert: + that: + - tripleo_overcloud_delete_output == "overcloud delete foo" + + - name: Validate "tripleo_overcloud_delete_yes" + include_role: + name: "tripleo_overcloud_delete" + vars: + tripleo_overcloud_delete_yes: true + + - name: Assert tripleo_overcloud_delete_yes + assert: + that: + - tripleo_overcloud_delete_output == "overcloud delete --yes" diff --git a/roles/tripleo_overcloud_delete/molecule/default/molecule.yml b/roles/tripleo_overcloud_delete/molecule/default/molecule.yml new file mode 100644 index 0000000..2841806 --- /dev/null +++ b/roles/tripleo_overcloud_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_delete/molecule/default/prepare.yml b/roles/tripleo_overcloud_delete/molecule/default/prepare.yml new file mode 100644 index 0000000..63bb6ab --- /dev/null +++ b/roles/tripleo_overcloud_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_delete/tasks/main.yml b/roles/tripleo_overcloud_delete/tasks/main.yml new file mode 100644 index 0000000..07c5d3e --- /dev/null +++ b/roles/tripleo_overcloud_delete/tasks/main.yml @@ -0,0 +1,48 @@ +--- +# tasks file for tripleo_overcloud_delete +- name: Set overcloud delete facts + set_fact: + _delete_cmd: >- + {{ tripleo_overcloud_delete_os_cloud | ternary('', "source " ~ tripleo_overcloud_delete_rc_file ~ "; ") }} + {{ openstack_bin }} overcloud delete + {{ tripleo_overcloud_delete_yes | ternary('--yes', '') }} + {{ tripleo_overcloud_delete_name }} + {{ tripleo_overcloud_delete_log_output | ternary((">" ~ tripleo_overcloud_delete_log), '') }} + {{ tripleo_overcloud_delete_log_combine | ternary("2>&1", '') }} + _delete_env: + OS_CLOUD: "{{ tripleo_overcloud_delete_os_cloud }}" + + +- name: Preserve existing log file if exists + timestamp_file: + path: "{{ tripleo_overcloud_delete_log }}" + when: tripleo_overcloud_delete_log_output|bool + +- name: Show debug information + when: tripleo_overcloud_delete_debug|bool + block: + - name: Show the command + debug: + var: _delete_cmd + + - name: Show the environment + debug: + var: _delete_env + +- name: openstack overcloud delete + shell: "{{ _delete_cmd }}" # noqa 305 + environment: "{{ _delete_env }}" + args: + executable: /bin/bash + chdir: "{{ tripleo_overcloud_delete_home_dir }}" + warn: false + register: tripleo_overcloud_delete_result + async: "{{ tripleo_overcloud_delete_timeout }}" + poll: "{{ tripleo_overcloud_delete_poll }}" + changed_when: false + when: not ansible_check_mode|bool + + +- name: Set output fact + set_fact: + tripleo_overcloud_delete_output: "{{ tripleo_overcloud_delete_result.stdout }}" diff --git a/roles/tripleo_overcloud_delete/tests/inventory b/roles/tripleo_overcloud_delete/tests/inventory new file mode 100644 index 0000000..2fbb50c --- /dev/null +++ b/roles/tripleo_overcloud_delete/tests/inventory @@ -0,0 +1 @@ +localhost diff --git a/roles/tripleo_overcloud_delete/tests/test.yml b/roles/tripleo_overcloud_delete/tests/test.yml new file mode 100644 index 0000000..1681952 --- /dev/null +++ b/roles/tripleo_overcloud_delete/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - tripleo_overcloud_delete diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index b5a2742..56a10d7 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -20,6 +20,7 @@ - tripleo-operator-molecule-tripleo_overcloud_container_image_tag_discover - tripleo-operator-molecule-tripleo_overcloud_container_image_upload - tripleo-operator-molecule-tripleo_overcloud_deploy + - tripleo-operator-molecule-tripleo_overcloud_delete - tripleo-operator-molecule-tripleo_overcloud_export - tripleo-operator-molecule-tripleo_overcloud_external_update_run - tripleo-operator-molecule-tripleo_overcloud_external_upgrade_run @@ -71,6 +72,7 @@ - tripleo-operator-molecule-tripleo_overcloud_container_image_tag_discover - tripleo-operator-molecule-tripleo_overcloud_container_image_upload - tripleo-operator-molecule-tripleo_overcloud_deploy + - tripleo-operator-molecule-tripleo_overcloud_delete - tripleo-operator-molecule-tripleo_overcloud_export - tripleo-operator-molecule-tripleo_overcloud_external_update_run - tripleo-operator-molecule-tripleo_overcloud_external_upgrade_run @@ -335,6 +337,20 @@ vars: tox_extra_args: tripleo_overcloud_deploy +- job: + files: + - ^roles/tripleo_overcloud_delete/.* + - ^bindep.txt + - ^galaxy.yml + - ^requirements.txt + - ^setup.cfg + - ^test-requirements.txt + - ^tox.ini + name: tripleo-operator-molecule-tripleo_overcloud_delete + parent: tripleo-operator-molecule-base + vars: + tox_extra_args: tripleo_overcloud_delete + - job: files: - ^roles/tripleo_overcloud_export/.*