Rename all roles that have a hyphen

All roles that have a hyphen in them need to be renamed to use an underscore. This change creates a symlink to all roles using their original name which will ensure we maintain compatibility with the rest of the TripleO stack. This is being done because roles with hyphens are no longer valid within collections. A temp PBR update has been made to accomodate all of the symlinks to the legacy role names. [0] https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#roles-directory Change-Id: Id00a3670351990e5489a297c4c7200f8c05af096 Signed-off-by: Kevin Carter <kecarter@redhat.com>
2020-01-21 20:42:40 -06:00
1 parent f9bb21a80b
commit 67ce344e30
@@ -24,7 +24,53 @@ data_files =
    share/ansible/tripleo-playbooks/ = tripleo_ansible/playbooks/*
    share/ansible/plugins/ = tripleo_ansible/ansible_plugins/*
    share/ansible/roles/ = tripleo_ansible/roles/*
-    share/ansible/roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
+    share/ansible/roles/tripleo_docker_rm/ = tripleo_ansible/roles/tripleo_docker_rm/*
+    # TODO(cloudnull): Remove this when the role rename is complete
+    share/ansible/roles/tripleo-config = tripleo_ansible/roles/tripleo_config/*
+    share/ansible/roles/tripleo-clients-install = tripleo_ansible/roles/tripleo_clients_install/*
+    share/ansible/roles/tripleo-timezone = tripleo_ansible/roles/tripleo_timezone/*
+    share/ansible/roles/octavia-overcloud-config = tripleo_ansible/roles/octavia_overcloud_config/*
+    share/ansible/roles/tripleo-cellv2 = tripleo_ansible/roles/tripleo_cellv2/*
+    share/ansible/roles/tripleo-securetty = tripleo_ansible/roles/tripleo_securetty/*
+    share/ansible/roles/tripleo-bootstrap = tripleo_ansible/roles/tripleo_bootstrap/*
+    share/ansible/roles/tripleo-create-admin = tripleo_ansible/roles/tripleo_create_admin/*
+    share/ansible/roles/tripleo-ceph-uuid = tripleo_ansible/roles/tripleo_ceph_uuid/*
+    share/ansible/roles/tripleo-puppet-cache = tripleo_ansible/roles/tripleo_puppet_cache/*
+    share/ansible/roles/tripleo-sshd = tripleo_ansible/roles/tripleo_sshd/*
+    share/ansible/roles/tripleo-container-image-prepare = tripleo_ansible/roles/tripleo_container_image_prepare/*
+    share/ansible/roles/tripleo-podman = tripleo_ansible/roles/tripleo_podman/*
+    share/ansible/roles/login-defs = tripleo_ansible/roles/login_defs/*
+    share/ansible/roles/tripleo-container-rm = tripleo_ansible/roles/tripleo_container_rm/*
+    share/ansible/roles/tripleo-ceph-work-dir = tripleo_ansible/roles/tripleo_ceph_work_dir/*
+    share/ansible/roles/tripleo-kernel = tripleo_ansible/roles/tripleo_kernel/*
+    share/ansible/roles/tripleo-ceph-fetch-dir = tripleo_ansible/roles/tripleo_ceph_fetch_dir/*
+    share/ansible/roles/tripleo-keystone-resources = tripleo_ansible/roles/tripleo_keystone_resources/*
+    share/ansible/roles/tripleo-hosts-entries = tripleo_ansible/roles/tripleo_hosts_entries/*
+    share/ansible/roles/tripleo-image-serve = tripleo_ansible/roles/tripleo_image_serve/*
+    share/ansible/roles/tripleo_docker_rm = tripleo_ansible/roles/tripleo-container-rm/*
+    share/ansible/roles/tripleo-firewall = tripleo_ansible/roles/tripleo_firewall/*
+    share/ansible/roles/tripleo-module-load = tripleo_ansible/roles/tripleo_module_load/*
+    share/ansible/roles/tripleo-ptp = tripleo_ansible/roles/tripleo_ptp/*
+    share/ansible/roles/octavia-controller-config = tripleo_ansible/roles/octavia_controller_config/*
+    share/ansible/roles/tripleo-container-manage = tripleo_ansible/roles/tripleo_container_manage/*
+    share/ansible/roles/tripleo-packages = tripleo_ansible/roles/tripleo_packages/*
+    share/ansible/roles/tripleo-ssh-known-hosts = tripleo_ansible/roles/tripleo_ssh_known_hosts/*
+    share/ansible/roles/tripleo-persist = tripleo_ansible/roles/tripleo_persist/*
+    share/ansible/roles/tripleo-hieradata = tripleo_ansible/roles/tripleo_hieradata/*
+    share/ansible/roles/tripleo-ceph-run-ansible = tripleo_ansible/roles/tripleo_ceph_run_ansible/*
+    share/ansible/roles/tripleo-transfer = tripleo_ansible/roles/tripleo_transfer/*
+    share/ansible/roles/tripleo-container-stop = tripleo_ansible/roles/tripleo_container_stop/*
+    share/ansible/roles/tripleo-ovs-dpdk = tripleo_ansible/roles/tripleo_ovs_dpdk/*
+    share/ansible/roles/octavia-controller-post-config = tripleo_ansible/roles/octavia_controller_post_config/*
+    share/ansible/roles/tripleo-container-tag = tripleo_ansible/roles/tripleo_container_tag/*
+    share/ansible/roles/tripleo-systemd-wrapper = tripleo_ansible/roles/tripleo_systemd_wrapper/*
+    share/ansible/roles/tripleo-nova-image-cache = tripleo_ansible/roles/tripleo_nova_image_cache/*
+    share/ansible/roles/tripleo-validations-package = tripleo_ansible/roles/tripleo_validations_package/*
+    share/ansible/roles/backup-and-restore = tripleo_ansible/roles/backup_and_restore/*
+    share/ansible/roles/tripleo-upgrade-hiera = tripleo_ansible/roles/tripleo_upgrade_hiera/*
+    share/ansible/roles/tripleo-ceph-common = tripleo_ansible/roles/tripleo_ceph_common/*
+    share/ansible/roles/octavia-undercloud = tripleo_ansible/roles/octavia_undercloud/*
+    # TODO(cloudnull): Remove this when the role rename is complete

 [wheel]
 universal = 1
@@ -0,0 +1 @@
+backup_and_restore
@@ -0,0 +1 @@
+login_defs
@@ -0,0 +1 @@
+octavia_controller_config
@@ -0,0 +1 @@
+octavia_controller_post_config
@@ -0,0 +1 @@
+octavia_overcloud_config
@@ -0,0 +1 @@
+octavia_undercloud
@@ -0,0 +1 @@
+tripleo_bootstrap
@@ -0,0 +1 @@
+tripleo_cellv2
@@ -0,0 +1 @@
+tripleo_ceph_common
@@ -0,0 +1 @@
+tripleo_ceph_fetch_dir
@@ -0,0 +1 @@
+tripleo_ceph_run_ansible
@@ -0,0 +1 @@
+tripleo_ceph_uuid
@@ -0,0 +1 @@
+tripleo_ceph_work_dir
@@ -0,0 +1 @@
+tripleo_clients_install
@@ -0,0 +1 @@
+tripleo_config
@@ -0,0 +1 @@
+tripleo_container_image_prepare
@@ -1,26 +0,0 @@
-# Molecule managed
-# 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.
-
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN apk add python
-
-ENTRYPOINT ["/entrypoint.sh"]
@@ -1,90 +0,0 @@
---
-driver:
-  name: docker
-
-log: true
-
-platforms:
-  - name: centos7
-    hostname: centos7
-    image: centos:7
-    dockerfile: Dockerfile
-    pkg_extras: python-setuptools
-    easy_install:
-      - pip
-    environment: &env
-      http_proxy: "{{ lookup('env', 'http_proxy') }}"
-      https_proxy: "{{ lookup('env', 'https_proxy') }}"
-    command: /sbin/init
-    security_opts:
-      - seccomp=unconfined
-    tmpfs:
-      - /run
-      - /tmp
-    capabilities:
-      - ALL
-    volumes: &vols
-      - /run/udev:/run/udev:ro
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-
-  # TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled.
-  #
-  # - name: centos8
-  #   hostname: centos8
-  #   image: centos:8
-  #   dockerfile: Dockerfile
-  #   pkg_extras: python*-setuptools
-  #   environment:
-  #     http_proxy: "{{ lookup('env', 'http_proxy') }}"
-  #     https_proxy: "{{ lookup('env', 'https_proxy') }}"
-  #   command: /sbin/init
-  #   privileged: true
-  #   security_opts:
-  #     - seccomp=unconfined
-  #   tmpfs:
-  #     - /run
-  #     - /tmp
-  #   capabilities:
-  #     - ALL
-  #   volumes: *vols
-
-  - name: registry
-    hostname: registry
-    image: registry:2
-    dockerfile: DockerfileRegistry
-    environment:
-      <<: *env
-    command: /etc/docker/registry/config.yml
-    exposed_ports:
-      - 5000/udp
-      - 5000/tcp
-    published_ports:
-      - 0.0.0.0:8787:5000/udp
-      - 0.0.0.0:8787:5000/tcp
-
-provisioner:
-  name: ansible
-  config_options:
-    defaults:
-      fact_caching: jsonfile
-      fact_caching_connection: /tmp/molecule/facts
-  env:
-    ANSIBLE_STDOUT_CALLBACK: yaml
-
-scenario:
-  test_sequence:
-    - destroy
-    - create
-    - prepare
-    - converge
-    - verify
-    - destroy
-
-lint:
-  enabled: false
-
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
@@ -1,91 +0,0 @@
---
-# 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.
-
-
- name: Converge
-  hosts: all
-  serial: 1
-  roles:
-    - role: "tripleo-container-image-prepare"
-      when:
-        - inventory_hostname != "registry"
-      tripleo_container_image_prepare_debug: true
-      tripleo_container_image_prepare_content:
-        parameter_defaults:
-          AdditionalArchitectures: []
-          ContainerImagePrepare:
-            - modify_append_tag: -updated-TEST
-              modify_only_with_labels:
-                - kolla_version
-              modify_role: tripleo-modify-image
-              modify_vars:
-                tasks_from: yum_update.yml
-                update_repo: gating-repo,delorean-current,quickstart-centos-ceph-nautilus
-                yum_repos_dir_path: /etc/yum.repos.d
-              push_destination: "{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"
-              set:
-                ceph_alertmanager_image: alertmanager
-                ceph_alertmanager_namespace: docker.io/prom
-                ceph_alertmanager_tag: latest
-                ceph_grafana_image: grafana
-                ceph_grafana_namespace: docker.io/grafana
-                ceph_grafana_tag: latest
-                ceph_image: daemon
-                ceph_namespace: docker.io/ceph
-                ceph_node_exporter_image: node-exporter
-                ceph_node_exporter_namespace: docker.io/prom
-                ceph_node_exporter_tag: latest
-                ceph_prometheus_image: prometheus
-                ceph_prometheus_namespace: docker.io/prom
-                ceph_prometheus_tag: latest
-                ceph_tag: v4.0.0-stable-4.0-nautilus-centos-7-x86_64
-                name_prefix: centos-binary-
-                name_suffix: ''
-                namespace: docker.io/tripleomaster
-                neutron_driver: ovn
-                tag: master
-              tag_from_label: null
-          ContainerImageRegistryCredentials: {}
-          DockerInsecureRegistryAddress:
-            - "{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"
-          DockerRegistryMirror: "https://registry-1.docker.io/"
-          NeutronMechanismDrivers:
-            - ovn
-          StandaloneCount: 1
-          StandaloneServices:
-            - OS::TripleO::Services::CACerts
-      tripleo_container_image_prepare_roles:
-        - CountDefault: 1
-          ServicesDefault:
-            - OS::TripleO::Services::CACerts
-          description: 'Testing'
-          disable_constraints: true
-          name: Standalone
-          networks:
-          External:
-            subnet: external_subnet
-          InternalApi:
-            subnet: internal_api_subnet
-          Storage:
-            subnet: storage_subnet
-          StorageMgmt:
-            subnet: storage_mgmt_subnet
-          Tenant:
-            subnet: tenant_subnet
-          tags:
-            - primary
-            - controller
-            - standalone
@@ -1,43 +0,0 @@
---
-# 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.
-
-
- name: Prepare
-  hosts: all
-  roles:
-    - role: test_deps
-      test_deps_setup_tripleo: true
-      when:
-        - inventory_hostname != "registry"
-  post_tasks:
-    - name: Install docker
-      package:
-        name: docker
-        state: present
-    - name: Create buildah directory
-      file:
-        path: /etc/containers
-        state: directory
-    - name: Create buildah registries config
-      copy:
-        content: |-
-          [registries.search]
-          registries = ['docker.io', 'registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com', 'registry.centos.org']
-          [registries.insecure]
-          registries = ["{{ hostvars['registry']['ansible_default_ipv4']['address'] }}:5000"]
-          [registries.block]
-          registries = []
-        dest: /etc/containers/registries.conf
@@ -0,0 +1 @@
+tripleo_container_manage
@@ -0,0 +1 @@
+tripleo_container_rm
@@ -0,0 +1 @@
+tripleo_container_stop
@@ -0,0 +1 @@
+tripleo_container_tag
@@ -0,0 +1 @@
+tripleo_create_admin
@@ -1 +1 @@
-tripleo-container-rm
+tripleo_docker_rm
@@ -0,0 +1 @@
+tripleo_firewall
@@ -0,0 +1 @@
+tripleo_hieradata
@@ -0,0 +1 @@
+tripleo_hosts_entries
@@ -0,0 +1 @@
+tripleo_image_serve
@@ -0,0 +1 @@
+tripleo_kernel
@@ -0,0 +1 @@
+tripleo_keystone_resources
@@ -0,0 +1 @@
+tripleo_module_load
@@ -0,0 +1 @@
+tripleo_nova_image_cache
@@ -0,0 +1 @@
+tripleo_ovs_dpdk
@@ -0,0 +1 @@
+tripleo_packages
@@ -0,0 +1 @@
+tripleo_persist
@@ -0,0 +1 @@
+tripleo_podman
@@ -0,0 +1 @@
+tripleo_ptp
@@ -0,0 +1 @@
+tripleo_puppet_cache
@@ -0,0 +1 @@
+tripleo_securetty
@@ -0,0 +1 @@
+tripleo_ssh_known_hosts
@@ -0,0 +1 @@
+tripleo_sshd
@@ -0,0 +1 @@
+tripleo_systemd_wrapper
@@ -0,0 +1 @@
+tripleo_timezone
@@ -0,0 +1 @@
+tripleo_transfer
@@ -0,0 +1 @@
+tripleo_upgrade_hiera
@@ -0,0 +1 @@
+tripleo_validations_package
@@ -1,37 +0,0 @@
-# Molecule managed
-# 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.
-
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
-    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
-
-{% for pkg in item.easy_install | default([]) %}
-# install pip for centos where there is no python-pip rpm in default repos
-RUN easy_install {{ pkg }}
-{% endfor %}
-
-
-CMD ["sh", "-c", "while true; do sleep 10000; done"]