diff --git a/playbooks/defaults/healthchecks-vars.yml b/playbooks/defaults/healthchecks-vars.yml deleted file mode 100644 index d95949f477..0000000000 --- a/playbooks/defaults/healthchecks-vars.yml +++ /dev/null @@ -1,107 +0,0 @@ ---- -# Copyright 2018, SUSE LINUX GmbH. -# -# 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. -# -# (c) 2018, Jean-Philippe Evrard -# ansible_python_interpreter: "{{ ansible_playbook_python }}" -glance_images: - - url: "https://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img" - dest: "/tmp/cirros-0.5.1.img" - checksum: "sha256:c4110030e2edf06db87f5b6e4efc27300977683d53f040996d15dcc0ad49bb5a" - format: "qcow2" - name: "cirros-healthcheck" - -cinder_volumes: - - name: healthcheck1 - size: 1 - -public_net_cidr: "{{ tempest_public_subnet_cidr | default('10.1.13.0/24') }}" -private_net_cidr: "{{ tempest_private_subnet_cidr | default('192.168.74.0/28') }}" -public_dns_servers: - - "8.8.8.8" - - "8.8.4.4" - -neutron_networks: - public: - name: "{{ tempest_public_net_name | default('physnet1') }}" - shared: True - external: True - pn_type: "{{ tempest_public_net_provider_type | default('flat') }}" - physical_network: "{{ tempest_public_net_physical_type | default('flat') }}" - subnets: - - name: "{{ tempest_public_subnet_name | default('public-subnet') }}" - ip_version: 4 - cidr: "{{ public_net_cidr }}" - enable_dhcp: "yes" - dns_nameservers: "{{ public_dns_servers }}" - private: - name: "{{ tempest_private_net_name | default('private') }}" - shared: True - external: True - pn_type: "{{ tempest_private_net_provider_type | default('vxlan') }}" - segmentation_id: "{{ tempest_private_net_seg_id | default('1') }}" - subnets: - - name: "{{ tempest_private_subnet_name | default('private-subnet') }}" - ip_version: 4 - cidr: "{{ private_net_cidr }}" - enable_dhcp: "yes" - -heat_stack: - # Please use the following for a nova app: - # https://opendev.org/openstack/heat-templates/raw/hot/hello_world.yaml - source_url: https://opendev.org/openstack/heat-templates/raw/hot/keystone/keystone_domain.yaml - dest_file: /tmp/mystack.yaml - name: babar - tag: dumbo - parameters: - domain_name: "babar" - domain_description: "Babar Kingdom" - domain_enabled: False # you don't want babar to impact the world of non-elephants. - -nova_flavors: - - name: healthcheck1 - ram: 256 - vcpus: 1 - disk: 1 - swap: 0 - ephemeral: 0 - -nova_vm: - name: vm1-healthcheck - image: cirros-healthcheck - flavor: healthcheck1 - network: "{{ neutron_networks.private.name }}" - -swift_object: - name: fstab - container: config - filename: /etc/fstab - -security_group: - name: healthcheck - rules: - - protocol: tcp - port_range_min: 22 - port_range_max: 22 - remote_ip_prefix: 0.0.0.0/0 - - protocol: tcp - port_range_min: 5000 - port_range_max: 5000 - remote_ip_prefix: 0.0.0.0/0 - - protocol: icmp - port_range_min: -1 - port_range_max: -1 - remote_ip_prefix: 0.0.0.0/0 - -ssh_key: "/root/.ssh/id_rsa-healthcheck" diff --git a/playbooks/hook-dummy.yml b/playbooks/hook-dummy.yml deleted file mode 100644 index a5816056f6..0000000000 --- a/playbooks/hook-dummy.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Placeholder hook - hosts: localhost - gather_facts: false diff --git a/playbooks/infra-journal-remote.yml b/playbooks/infra-journal-remote.yml index f5c05c27e6..39b606ae15 100644 --- a/playbooks/infra-journal-remote.yml +++ b/playbooks/infra-journal-remote.yml @@ -13,18 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Gather facts - hosts: hosts - gather_facts: "{{ osa_gather_facts | default(True) }}" - tags: - - always - -- name: Install Journal-Remote - hosts: hosts - gather_facts: false - tasks: - - name: Include journald-remote role - include_role: - name: openstack.osa.journald_remote - tags: - - journal-remote +- name: Import journald_remote playbook + ansible.builtin.import_playbook: openstack.osa.journald_remote diff --git a/playbooks/listening-port-report.yml b/playbooks/listening-port-report.yml index b8a7e4f3f7..40c495aaa6 100644 --- a/playbooks/listening-port-report.yml +++ b/playbooks/listening-port-report.yml @@ -1,3 +1,4 @@ +--- # Copyright 2018, BBC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,27 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Gather listening ports report - hosts: all - gather_facts: no - tasks: - - name: Gather listening ports - command: netstat -ln --inet --program - register: listening_ports - changed_when: false - - - name: Create report - copy: - content: | - {% for host in ansible_play_hosts %} - hostname: {{ host }} - listening_ports: - {% for port in hostvars[host].listening_ports['stdout_lines'] %} - {{ port }} - {% endfor %} - - {% endfor %} - dest: /tmp/listening_port_report.txt - mode: "0640" - delegate_to: localhost - run_once: true +- name: Import listening_ports_report playbook + ansible.builtin.import_playbook: openstack.osa.healthcheck.listening_ports_report diff --git a/playbooks/openstack-resources.yml b/playbooks/openstack-resources.yml index 2eb5035ee3..54f939d75b 100644 --- a/playbooks/openstack-resources.yml +++ b/playbooks/openstack-resources.yml @@ -13,26 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Create requested OpenStack Resources - hosts: "{{ openstack_service_setup_host | default(groups['utility_all'][0] | default('localhost')) }}" - tasks: - - name: Setup installation variables - include_role: - name: openstack.osa.install_defaults - defaults_from: "{{ install_method }}" - public: true - apply: - tags: - - always - tags: - - always - - - name: Include openstack_resources role - ansible.builtin.include_role: - name: openstack.osa.openstack_resources - vars: - openstack_resources_identity: "{{ openstack_user_identity | default({}) }}" - openstack_resources_compute: "{{ openstack_user_compute | default({}) }}" - openstack_resources_network: "{{ openstack_user_network | default({}) }}" - openstack_resources_image: "{{ openstack_user_image | default({}) }}" - openstack_resources_coe: "{{ openstack_user_coe | default({}) }}" +- name: Import openstack_resources playbook + import_playbook: openstack.osa.openstack_resources diff --git a/playbooks/setup-everything.yml b/playbooks/setup-everything.yml index 69be0d60ec..2f25b197a3 100644 --- a/playbooks/setup-everything.yml +++ b/playbooks/setup-everything.yml @@ -13,11 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Importing setup-hosts playbook - import_playbook: setup-hosts.yml - -- name: Importing setup-infrastructure playbook - import_playbook: setup-infrastructure.yml - -- name: Importing setup-openstack playbook - import_playbook: setup-openstack.yml +- name: Import setup_everything playbook + import_playbook: openstack.osa.setup_everything