diff --git a/setup.cfg b/setup.cfg index 1372a0ccc..3e8b9b893 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 diff --git a/tripleo_ansible/roles/backup-and-restore b/tripleo_ansible/roles/backup-and-restore new file mode 120000 index 000000000..0ec225fec --- /dev/null +++ b/tripleo_ansible/roles/backup-and-restore @@ -0,0 +1 @@ +backup_and_restore \ No newline at end of file diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml rename to tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/defaults/main.yml b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/defaults/main.yml rename to tripleo_ansible/roles/backup_and_restore/defaults/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/meta/main.yml b/tripleo_ansible/roles/backup_and_restore/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/meta/main.yml rename to tripleo_ansible/roles/backup_and_restore/meta/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/Dockerfile b/tripleo_ansible/roles/backup_and_restore/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/molecule/default/Dockerfile rename to tripleo_ansible/roles/backup_and_restore/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml rename to tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml rename to tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml rename to tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml rename to tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml rename to tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/tasks/main.yml rename to tripleo_ansible/roles/backup_and_restore/tasks/main.yml diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml rename to tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml rename to tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml diff --git a/tripleo_ansible/roles/backup-and-restore/templates/exports.j2 b/tripleo_ansible/roles/backup_and_restore/templates/exports.j2 similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/templates/exports.j2 rename to tripleo_ansible/roles/backup_and_restore/templates/exports.j2 diff --git a/tripleo_ansible/roles/backup-and-restore/templates/local.conf.j2 b/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/templates/local.conf.j2 rename to tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 diff --git a/tripleo_ansible/roles/backup-and-restore/templates/rescue.conf.j2 b/tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/templates/rescue.conf.j2 rename to tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 diff --git a/tripleo_ansible/roles/backup-and-restore/vars/redhat.yml b/tripleo_ansible/roles/backup_and_restore/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/backup-and-restore/vars/redhat.yml rename to tripleo_ansible/roles/backup_and_restore/vars/redhat.yml diff --git a/tripleo_ansible/roles/login-defs b/tripleo_ansible/roles/login-defs new file mode 120000 index 000000000..e983eebdf --- /dev/null +++ b/tripleo_ansible/roles/login-defs @@ -0,0 +1 @@ +login_defs \ No newline at end of file diff --git a/tripleo_ansible/roles/login-defs/defaults/main.yml b/tripleo_ansible/roles/login_defs/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/defaults/main.yml rename to tripleo_ansible/roles/login_defs/defaults/main.yml diff --git a/tripleo_ansible/roles/login-defs/meta/main.yml b/tripleo_ansible/roles/login_defs/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/meta/main.yml rename to tripleo_ansible/roles/login_defs/meta/main.yml diff --git a/tripleo_ansible/roles/login-defs/molecule/default/Dockerfile b/tripleo_ansible/roles/login_defs/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/login-defs/molecule/default/Dockerfile rename to tripleo_ansible/roles/login_defs/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/molecule/default/molecule.yml rename to tripleo_ansible/roles/login_defs/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/login-defs/molecule/default/playbook.yml b/tripleo_ansible/roles/login_defs/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/molecule/default/playbook.yml rename to tripleo_ansible/roles/login_defs/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/login-defs/molecule/default/prepare.yml b/tripleo_ansible/roles/login_defs/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/molecule/default/prepare.yml rename to tripleo_ansible/roles/login_defs/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/login-defs/molecule/default/verify.yml b/tripleo_ansible/roles/login_defs/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/molecule/default/verify.yml rename to tripleo_ansible/roles/login_defs/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/login-defs/tasks/main.yml b/tripleo_ansible/roles/login_defs/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/login-defs/tasks/main.yml rename to tripleo_ansible/roles/login_defs/tasks/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-config b/tripleo_ansible/roles/octavia-controller-config new file mode 120000 index 000000000..3a13f7cc4 --- /dev/null +++ b/tripleo_ansible/roles/octavia-controller-config @@ -0,0 +1 @@ +octavia_controller_config \ No newline at end of file diff --git a/tripleo_ansible/roles/octavia-controller-post-config b/tripleo_ansible/roles/octavia-controller-post-config new file mode 120000 index 000000000..32ed67e9f --- /dev/null +++ b/tripleo_ansible/roles/octavia-controller-post-config @@ -0,0 +1 @@ +octavia_controller_post_config \ No newline at end of file diff --git a/tripleo_ansible/roles/octavia-overcloud-config b/tripleo_ansible/roles/octavia-overcloud-config new file mode 120000 index 000000000..92270510f --- /dev/null +++ b/tripleo_ansible/roles/octavia-overcloud-config @@ -0,0 +1 @@ +octavia_overcloud_config \ No newline at end of file diff --git a/tripleo_ansible/roles/octavia-undercloud b/tripleo_ansible/roles/octavia-undercloud new file mode 120000 index 000000000..7011a1909 --- /dev/null +++ b/tripleo_ansible/roles/octavia-undercloud @@ -0,0 +1 @@ +octavia_undercloud \ No newline at end of file diff --git a/tripleo_ansible/roles/octavia-controller-config/handlers/main.yml b/tripleo_ansible/roles/octavia_controller_config/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/handlers/main.yml rename to tripleo_ansible/roles/octavia_controller_config/handlers/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/meta/main.yml b/tripleo_ansible/roles/octavia_controller_config/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/meta/main.yml rename to tripleo_ansible/roles/octavia_controller_config/meta/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/certificate.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml rename to tripleo_ansible/roles/octavia_controller_config/tasks/certificate.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/main.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/tasks/main.yml rename to tripleo_ansible/roles/octavia_controller_config/tasks/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/netinterface.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/tasks/netinterface.yml rename to tripleo_ansible/roles/octavia_controller_config/tasks/netinterface.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/netport.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/tasks/netport.yml rename to tripleo_ansible/roles/octavia_controller_config/tasks/netport.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/octavia.yml b/tripleo_ansible/roles/octavia_controller_config/tasks/octavia.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/tasks/octavia.yml rename to tripleo_ansible/roles/octavia_controller_config/tasks/octavia.yml diff --git a/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg-br-int.j2 b/tripleo_ansible/roles/octavia_controller_config/templates/ifcfg-br-int.j2 similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/templates/ifcfg-br-int.j2 rename to tripleo_ansible/roles/octavia_controller_config/templates/ifcfg-br-int.j2 diff --git a/tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2 b/tripleo_ansible/roles/octavia_controller_config/templates/ifcfg.j2 similarity index 100% rename from tripleo_ansible/roles/octavia-controller-config/templates/ifcfg.j2 rename to tripleo_ansible/roles/octavia_controller_config/templates/ifcfg.j2 diff --git a/tripleo_ansible/roles/octavia-controller-post-config/defaults/main.yml b/tripleo_ansible/roles/octavia_controller_post_config/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-post-config/defaults/main.yml rename to tripleo_ansible/roles/octavia_controller_post_config/defaults/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-post-config/meta/main.yml b/tripleo_ansible/roles/octavia_controller_post_config/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-post-config/meta/main.yml rename to tripleo_ansible/roles/octavia_controller_post_config/meta/main.yml diff --git a/tripleo_ansible/roles/octavia-controller-post-config/tasks/main.yml b/tripleo_ansible/roles/octavia_controller_post_config/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-controller-post-config/tasks/main.yml rename to tripleo_ansible/roles/octavia_controller_post_config/tasks/main.yml diff --git a/tripleo_ansible/roles/octavia-overcloud-config/meta/main.yml b/tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-overcloud-config/meta/main.yml rename to tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml diff --git a/tripleo_ansible/roles/octavia-overcloud-config/tasks/certs_gen.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/certs_gen.yml similarity index 100% rename from tripleo_ansible/roles/octavia-overcloud-config/tasks/certs_gen.yml rename to tripleo_ansible/roles/octavia_overcloud_config/tasks/certs_gen.yml diff --git a/tripleo_ansible/roles/octavia-overcloud-config/tasks/main.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-overcloud-config/tasks/main.yml rename to tripleo_ansible/roles/octavia_overcloud_config/tasks/main.yml diff --git a/tripleo_ansible/roles/octavia-overcloud-config/tasks/network.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/network.yml similarity index 100% rename from tripleo_ansible/roles/octavia-overcloud-config/tasks/network.yml rename to tripleo_ansible/roles/octavia_overcloud_config/tasks/network.yml diff --git a/tripleo_ansible/roles/octavia-overcloud-config/tasks/quotas.yml b/tripleo_ansible/roles/octavia_overcloud_config/tasks/quotas.yml similarity index 100% rename from tripleo_ansible/roles/octavia-overcloud-config/tasks/quotas.yml rename to tripleo_ansible/roles/octavia_overcloud_config/tasks/quotas.yml diff --git a/tripleo_ansible/roles/octavia-undercloud/meta/main.yml b/tripleo_ansible/roles/octavia_undercloud/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-undercloud/meta/main.yml rename to tripleo_ansible/roles/octavia_undercloud/meta/main.yml diff --git a/tripleo_ansible/roles/octavia-undercloud/tasks/image_mgmt.yml b/tripleo_ansible/roles/octavia_undercloud/tasks/image_mgmt.yml similarity index 100% rename from tripleo_ansible/roles/octavia-undercloud/tasks/image_mgmt.yml rename to tripleo_ansible/roles/octavia_undercloud/tasks/image_mgmt.yml diff --git a/tripleo_ansible/roles/octavia-undercloud/tasks/main.yml b/tripleo_ansible/roles/octavia_undercloud/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/octavia-undercloud/tasks/main.yml rename to tripleo_ansible/roles/octavia_undercloud/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap b/tripleo_ansible/roles/tripleo-bootstrap new file mode 120000 index 000000000..e7d6221e4 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-bootstrap @@ -0,0 +1 @@ +tripleo_bootstrap \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-cellv2 b/tripleo_ansible/roles/tripleo-cellv2 new file mode 120000 index 000000000..7284167f8 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-cellv2 @@ -0,0 +1 @@ +tripleo_cellv2 \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ceph-common b/tripleo_ansible/roles/tripleo-ceph-common new file mode 120000 index 000000000..63562e5e9 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ceph-common @@ -0,0 +1 @@ +tripleo_ceph_common \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir b/tripleo_ansible/roles/tripleo-ceph-fetch-dir new file mode 120000 index 000000000..7317d5293 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ceph-fetch-dir @@ -0,0 +1 @@ +tripleo_ceph_fetch_dir \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible b/tripleo_ansible/roles/tripleo-ceph-run-ansible new file mode 120000 index 000000000..1b25ce4f9 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ceph-run-ansible @@ -0,0 +1 @@ +tripleo_ceph_run_ansible \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid b/tripleo_ansible/roles/tripleo-ceph-uuid new file mode 120000 index 000000000..832c04d5e --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ceph-uuid @@ -0,0 +1 @@ +tripleo_ceph_uuid \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir b/tripleo_ansible/roles/tripleo-ceph-work-dir new file mode 120000 index 000000000..adbc26eb2 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ceph-work-dir @@ -0,0 +1 @@ +tripleo_ceph_work_dir \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-clients-install b/tripleo_ansible/roles/tripleo-clients-install new file mode 120000 index 000000000..2f9d5fe9f --- /dev/null +++ b/tripleo_ansible/roles/tripleo-clients-install @@ -0,0 +1 @@ +tripleo_clients_install \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-config b/tripleo_ansible/roles/tripleo-config new file mode 120000 index 000000000..740e88e68 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-config @@ -0,0 +1 @@ +tripleo_config \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare b/tripleo_ansible/roles/tripleo-container-image-prepare new file mode 120000 index 000000000..9489c953e --- /dev/null +++ b/tripleo_ansible/roles/tripleo-container-image-prepare @@ -0,0 +1 @@ +tripleo_container_image_prepare \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/DockerfileRegistry b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/DockerfileRegistry deleted file mode 100644 index 10597f707..000000000 --- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/DockerfileRegistry +++ /dev/null @@ -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"] diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml deleted file mode 100644 index 7d0a7ce9e..000000000 --- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/molecule.yml +++ /dev/null @@ -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 diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/playbook.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/playbook.yml deleted file mode 100644 index db72d40cc..000000000 --- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/playbook.yml +++ /dev/null @@ -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 diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/prepare.yml b/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/prepare.yml deleted file mode 100644 index a976c3612..000000000 --- a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/prepare.yml +++ /dev/null @@ -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 diff --git a/tripleo_ansible/roles/tripleo-container-manage b/tripleo_ansible/roles/tripleo-container-manage new file mode 120000 index 000000000..2dc16918b --- /dev/null +++ b/tripleo_ansible/roles/tripleo-container-manage @@ -0,0 +1 @@ +tripleo_container_manage \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-container-rm b/tripleo_ansible/roles/tripleo-container-rm new file mode 120000 index 000000000..844bc37b4 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-container-rm @@ -0,0 +1 @@ +tripleo_container_rm \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-container-stop b/tripleo_ansible/roles/tripleo-container-stop new file mode 120000 index 000000000..03e18b61b --- /dev/null +++ b/tripleo_ansible/roles/tripleo-container-stop @@ -0,0 +1 @@ +tripleo_container_stop \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-container-tag b/tripleo_ansible/roles/tripleo-container-tag new file mode 120000 index 000000000..8b2ae68db --- /dev/null +++ b/tripleo_ansible/roles/tripleo-container-tag @@ -0,0 +1 @@ +tripleo_container_tag \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-create-admin b/tripleo_ansible/roles/tripleo-create-admin new file mode 120000 index 000000000..320c9b6e4 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-create-admin @@ -0,0 +1 @@ +tripleo_create_admin \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-docker-rm b/tripleo_ansible/roles/tripleo-docker-rm index 26535b189..810f5ca1f 120000 --- a/tripleo_ansible/roles/tripleo-docker-rm +++ b/tripleo_ansible/roles/tripleo-docker-rm @@ -1 +1 @@ -tripleo-container-rm \ No newline at end of file +tripleo_docker_rm \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-firewall b/tripleo_ansible/roles/tripleo-firewall new file mode 120000 index 000000000..42de5bfeb --- /dev/null +++ b/tripleo_ansible/roles/tripleo-firewall @@ -0,0 +1 @@ +tripleo_firewall \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-hieradata b/tripleo_ansible/roles/tripleo-hieradata new file mode 120000 index 000000000..e28f047d7 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-hieradata @@ -0,0 +1 @@ +tripleo_hieradata \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-hosts-entries b/tripleo_ansible/roles/tripleo-hosts-entries new file mode 120000 index 000000000..32e7956bf --- /dev/null +++ b/tripleo_ansible/roles/tripleo-hosts-entries @@ -0,0 +1 @@ +tripleo_hosts_entries \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-image-serve b/tripleo_ansible/roles/tripleo-image-serve new file mode 120000 index 000000000..b3072b49d --- /dev/null +++ b/tripleo_ansible/roles/tripleo-image-serve @@ -0,0 +1 @@ +tripleo_image_serve \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-kernel b/tripleo_ansible/roles/tripleo-kernel new file mode 120000 index 000000000..4f9f30a76 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-kernel @@ -0,0 +1 @@ +tripleo_kernel \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-keystone-resources b/tripleo_ansible/roles/tripleo-keystone-resources new file mode 120000 index 000000000..603c6474f --- /dev/null +++ b/tripleo_ansible/roles/tripleo-keystone-resources @@ -0,0 +1 @@ +tripleo_keystone_resources \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-module-load b/tripleo_ansible/roles/tripleo-module-load new file mode 120000 index 000000000..97e106dd2 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-module-load @@ -0,0 +1 @@ +tripleo_module_load \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache b/tripleo_ansible/roles/tripleo-nova-image-cache new file mode 120000 index 000000000..906c54ccc --- /dev/null +++ b/tripleo_ansible/roles/tripleo-nova-image-cache @@ -0,0 +1 @@ +tripleo_nova_image_cache \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk b/tripleo_ansible/roles/tripleo-ovs-dpdk new file mode 120000 index 000000000..dbe52710b --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk @@ -0,0 +1 @@ +tripleo_ovs_dpdk \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-packages b/tripleo_ansible/roles/tripleo-packages new file mode 120000 index 000000000..aa17b9dd7 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-packages @@ -0,0 +1 @@ +tripleo_packages \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-persist b/tripleo_ansible/roles/tripleo-persist new file mode 120000 index 000000000..3a6aeda9c --- /dev/null +++ b/tripleo_ansible/roles/tripleo-persist @@ -0,0 +1 @@ +tripleo_persist \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-podman b/tripleo_ansible/roles/tripleo-podman new file mode 120000 index 000000000..716f9a33a --- /dev/null +++ b/tripleo_ansible/roles/tripleo-podman @@ -0,0 +1 @@ +tripleo_podman \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ptp b/tripleo_ansible/roles/tripleo-ptp new file mode 120000 index 000000000..adc38f250 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ptp @@ -0,0 +1 @@ +tripleo_ptp \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-puppet-cache b/tripleo_ansible/roles/tripleo-puppet-cache new file mode 120000 index 000000000..5796199e6 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-puppet-cache @@ -0,0 +1 @@ +tripleo_puppet_cache \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-securetty b/tripleo_ansible/roles/tripleo-securetty new file mode 120000 index 000000000..a4cc1576f --- /dev/null +++ b/tripleo_ansible/roles/tripleo-securetty @@ -0,0 +1 @@ +tripleo_securetty \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts b/tripleo_ansible/roles/tripleo-ssh-known-hosts new file mode 120000 index 000000000..0242f20bd --- /dev/null +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts @@ -0,0 +1 @@ +tripleo_ssh_known_hosts \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-sshd b/tripleo_ansible/roles/tripleo-sshd new file mode 120000 index 000000000..3b968501c --- /dev/null +++ b/tripleo_ansible/roles/tripleo-sshd @@ -0,0 +1 @@ +tripleo_sshd \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper b/tripleo_ansible/roles/tripleo-systemd-wrapper new file mode 120000 index 000000000..cd3b962ae --- /dev/null +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper @@ -0,0 +1 @@ +tripleo_systemd_wrapper \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-timezone b/tripleo_ansible/roles/tripleo-timezone new file mode 120000 index 000000000..07b3ac5b3 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-timezone @@ -0,0 +1 @@ +tripleo_timezone \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-transfer b/tripleo_ansible/roles/tripleo-transfer new file mode 120000 index 000000000..80427c480 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-transfer @@ -0,0 +1 @@ +tripleo_transfer \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera b/tripleo_ansible/roles/tripleo-upgrade-hiera new file mode 120000 index 000000000..3d3ded231 --- /dev/null +++ b/tripleo_ansible/roles/tripleo-upgrade-hiera @@ -0,0 +1 @@ +tripleo_upgrade_hiera \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-validations-package b/tripleo_ansible/roles/tripleo-validations-package new file mode 120000 index 000000000..59bcef4dd --- /dev/null +++ b/tripleo_ansible/roles/tripleo-validations-package @@ -0,0 +1 @@ +tripleo_validations_package \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo-validations-package/molecule/default/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/Dockerfile +++ /dev/null @@ -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"] diff --git a/tripleo_ansible/roles/tripleo-bootstrap/defaults/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/defaults/main.yml rename to tripleo_ansible/roles/tripleo_bootstrap/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/meta/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/meta/main.yml rename to tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_bootstrap/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_bootstrap/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/molecule/default/tests/test_default.py rename to tripleo_ansible/roles/tripleo_bootstrap/molecule/default/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml rename to tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/vars/fedora-28.yml b/tripleo_ansible/roles/tripleo_bootstrap/vars/fedora-28.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/vars/fedora-28.yml rename to tripleo_ansible/roles/tripleo_bootstrap/vars/fedora-28.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/vars/redhat-8.yml b/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/vars/redhat-8.yml rename to tripleo_ansible/roles/tripleo_bootstrap/vars/redhat-8.yml diff --git a/tripleo_ansible/roles/tripleo-bootstrap/vars/redhat.yml b/tripleo_ansible/roles/tripleo_bootstrap/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-bootstrap/vars/redhat.yml rename to tripleo_ansible/roles/tripleo_bootstrap/vars/redhat.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/defaults/main.yml b/tripleo_ansible/roles/tripleo_cellv2/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/defaults/main.yml rename to tripleo_ansible/roles/tripleo_cellv2/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/handlers/main.yml b/tripleo_ansible/roles/tripleo_cellv2/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/handlers/main.yml rename to tripleo_ansible/roles/tripleo_cellv2/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/meta/main.yml b/tripleo_ansible/roles/tripleo_cellv2/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/meta/main.yml rename to tripleo_ansible/roles/tripleo_cellv2/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_cellv2/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_cellv2/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/tasks/add_internalapi_hosts_entries.yml b/tripleo_ansible/roles/tripleo_cellv2/tasks/add_internalapi_hosts_entries.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/tasks/add_internalapi_hosts_entries.yml rename to tripleo_ansible/roles/tripleo_cellv2/tasks/add_internalapi_hosts_entries.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/tasks/check_cell_exist.yml b/tripleo_ansible/roles/tripleo_cellv2/tasks/check_cell_exist.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/tasks/check_cell_exist.yml rename to tripleo_ansible/roles/tripleo_cellv2/tasks/check_cell_exist.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/tasks/create_cell.yml b/tripleo_ansible/roles/tripleo_cellv2/tasks/create_cell.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/tasks/create_cell.yml rename to tripleo_ansible/roles/tripleo_cellv2/tasks/create_cell.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/tasks/discover_hosts.yml b/tripleo_ansible/roles/tripleo_cellv2/tasks/discover_hosts.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/tasks/discover_hosts.yml rename to tripleo_ansible/roles/tripleo_cellv2/tasks/discover_hosts.yml diff --git a/tripleo_ansible/roles/tripleo-cellv2/tasks/extract_cell_information.yml b/tripleo_ansible/roles/tripleo_cellv2/tasks/extract_cell_information.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-cellv2/tasks/extract_cell_information.yml rename to tripleo_ansible/roles/tripleo_cellv2/tasks/extract_cell_information.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/defaults/main.yml b/tripleo_ansible/roles/tripleo_ceph_common/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/defaults/main.yml rename to tripleo_ansible/roles/tripleo_ceph_common/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ceph_common/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_common/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml b/tripleo_ansible/roles/tripleo_ceph_common/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ceph_common/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-common/vars/main.yml b/tripleo_ansible/roles/tripleo_ceph_common/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-common/vars/main.yml rename to tripleo_ansible/roles/tripleo_ceph_common/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/meta/main.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/backup_and_clean.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/backup_and_clean.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/backup_and_clean.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/backup_and_clean.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/create.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/create.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/create.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/create.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/main.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/vars/main.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-fetch-dir/vars/main.yml rename to tripleo_ansible/roles/tripleo_ceph_fetch_dir/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/meta/main.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/main.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ceph_run_ansible/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/meta/main.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/tasks/gather.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/tasks/gather.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/tasks/gather.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/tasks/gather.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/tasks/main.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-uuid/tasks/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/tasks/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-uuid/tasks/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_uuid/tasks/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/meta/main.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/get_ssh_private_key.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/get_ssh_private_key.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/get_ssh_private_key.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/get_ssh_private_key.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/main.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ceph-work-dir/tasks/prepare.yml rename to tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml b/tripleo_ansible/roles/tripleo_clients_install/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml rename to tripleo_ansible/roles/tripleo_clients_install/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/meta/main.yml b/tripleo_ansible/roles/tripleo_clients_install/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/meta/main.yml rename to tripleo_ansible/roles/tripleo_clients_install/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_clients_install/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_clients_install/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/tasks/install_pkgs.yml b/tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/tasks/install_pkgs.yml rename to tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml b/tripleo_ansible/roles/tripleo_clients_install/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml rename to tripleo_ansible/roles/tripleo_clients_install/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/vars/fedora.yml b/tripleo_ansible/roles/tripleo_clients_install/vars/fedora.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/vars/fedora.yml rename to tripleo_ansible/roles/tripleo_clients_install/vars/fedora.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/vars/main.yml b/tripleo_ansible/roles/tripleo_clients_install/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/vars/main.yml rename to tripleo_ansible/roles/tripleo_clients_install/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-clients-install/vars/redhat-8.yml b/tripleo_ansible/roles/tripleo_clients_install/vars/redhat-8.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-clients-install/vars/redhat-8.yml rename to tripleo_ansible/roles/tripleo_clients_install/vars/redhat-8.yml diff --git a/tripleo_ansible/roles/tripleo-config/defaults/main.yml b/tripleo_ansible/roles/tripleo_config/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/defaults/main.yml rename to tripleo_ansible/roles/tripleo_config/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-config/meta/main.yml b/tripleo_ansible/roles/tripleo_config/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/meta/main.yml rename to tripleo_ansible/roles/tripleo_config/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-config/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_config/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_config/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-config/tasks/main.yml b/tripleo_ansible/roles/tripleo_config/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-config/tasks/main.yml rename to tripleo_ansible/roles/tripleo_config/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-config/templates/ini-config.j2 b/tripleo_ansible/roles/tripleo_config/templates/ini-config.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-config/templates/ini-config.j2 rename to tripleo_ansible/roles/tripleo_config/templates/ini-config.j2 diff --git a/tripleo_ansible/roles/tripleo-config/templates/json-config.j2 b/tripleo_ansible/roles/tripleo_config/templates/json-config.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-config/templates/json-config.j2 rename to tripleo_ansible/roles/tripleo_config/templates/json-config.j2 diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/defaults/main.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/handlers/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/handlers/main.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/meta/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/meta/main.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/Dockerfile b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/molecule/build/Dockerfile rename to tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/tasks/main.yml rename to tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/defaults/main.yml rename to tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/91-netns-placeholder-preset b/tripleo_ansible/roles/tripleo_container_manage/files/91-netns-placeholder-preset similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/91-netns-placeholder-preset rename to tripleo_ansible/roles/tripleo_container_manage/files/91-netns-placeholder-preset diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/91-tripleo-container-shutdown-preset b/tripleo_ansible/roles/tripleo_container_manage/files/91-tripleo-container-shutdown-preset similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/91-tripleo-container-shutdown-preset rename to tripleo_ansible/roles/tripleo_container_manage/files/91-tripleo-container-shutdown-preset diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/netns-placeholder-service b/tripleo_ansible/roles/tripleo_container_manage/files/netns-placeholder-service similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/netns-placeholder-service rename to tripleo_ansible/roles/tripleo_container_manage/files/netns-placeholder-service diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/tripleo-container-shutdown b/tripleo_ansible/roles/tripleo_container_manage/files/tripleo-container-shutdown similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/tripleo-container-shutdown rename to tripleo_ansible/roles/tripleo_container_manage/files/tripleo-container-shutdown diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/tripleo-container-shutdown-service b/tripleo_ansible/roles/tripleo_container_manage/files/tripleo-container-shutdown-service similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/tripleo-container-shutdown-service rename to tripleo_ansible/roles/tripleo_container_manage/files/tripleo-container-shutdown-service diff --git a/tripleo_ansible/roles/tripleo-container-manage/files/tripleo-start-podman-container b/tripleo_ansible/roles/tripleo_container_manage/files/tripleo-start-podman-container similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/files/tripleo-start-podman-container rename to tripleo_ansible/roles/tripleo_container_manage/files/tripleo-start-podman-container diff --git a/tripleo_ansible/roles/tripleo-container-manage/meta/main.yml b/tripleo_ansible/roles/tripleo_container_manage/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/meta/main.yml rename to tripleo_ansible/roles/tripleo_container_manage/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_container_manage/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_container_manage/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/container_running.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/container_running.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/container_running.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/container_running.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/create.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/create.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/create.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/create.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/delete.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/delete.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/delete.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/delete.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/create.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/delete.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/delete.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/delete.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/delete.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/exec.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/exec.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/manage.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/manage.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/manage.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/start_order.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/start_order.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/start_order.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/start_order.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/podman/systemd.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/systemd.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/podman/systemd.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/podman/systemd.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/shutdown.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/shutdown.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/tasks/shutdown.yml rename to tripleo_ansible/roles/tripleo_container_manage/tasks/shutdown.yml diff --git a/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-healthcheck.j2 b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-healthcheck.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/templates/systemd-healthcheck.j2 rename to tripleo_ansible/roles/tripleo_container_manage/templates/systemd-healthcheck.j2 diff --git a/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2 b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/templates/systemd-service.j2 rename to tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 diff --git a/tripleo_ansible/roles/tripleo-container-manage/templates/systemd-timer.j2 b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-timer.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-container-manage/templates/systemd-timer.j2 rename to tripleo_ansible/roles/tripleo_container_manage/templates/systemd-timer.j2 diff --git a/tripleo_ansible/roles/tripleo-container-rm/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_rm/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/defaults/main.yml rename to tripleo_ansible/roles/tripleo_container_rm/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/meta/main.yml b/tripleo_ansible/roles/tripleo_container_rm/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/meta/main.yml rename to tripleo_ansible/roles/tripleo_container_rm/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/molecule.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/playbook.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/prepare.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/docker_rm/prepare.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/molecule.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/playbook.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/prepare.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/legacy_vars/prepare.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/molecule.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/playbook.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/prepare.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman-rm-stopped/prepare.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman/molecule.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman/playbook.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/molecule/podman/prepare.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/molecule/podman/prepare.yml rename to tripleo_ansible/roles/tripleo_container_rm/molecule/podman/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_rm/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/tasks/main.yml rename to tripleo_ansible/roles/tripleo_container_rm/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/tasks/tripleo_docker_container_rm.yml b/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_docker_container_rm.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/tasks/tripleo_docker_container_rm.yml rename to tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_docker_container_rm.yml diff --git a/tripleo_ansible/roles/tripleo-container-rm/tasks/tripleo_podman_container_rm.yml b/tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-rm/tasks/tripleo_podman_container_rm.yml rename to tripleo_ansible/roles/tripleo_container_rm/tasks/tripleo_podman_container_rm.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_stop/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/defaults/main.yml rename to tripleo_ansible/roles/tripleo_container_stop/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/meta/main.yml b/tripleo_ansible/roles/tripleo_container_stop/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/meta/main.yml rename to tripleo_ansible/roles/tripleo_container_stop/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-container-image-prepare/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_container_stop/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_container_stop/molecule/podman/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/podman/molecule.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/podman/molecule.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/podman/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/podman/playbook.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/podman/prepare.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/podman/prepare.yml rename to tripleo_ansible/roles/tripleo_container_stop/molecule/podman/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/tasks/main.yml rename to tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/tasks/tripleo_container_stop.yaml b/tripleo_ansible/roles/tripleo_container_stop/tasks/tripleo_container_stop.yaml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/tasks/tripleo_container_stop.yaml rename to tripleo_ansible/roles/tripleo_container_stop/tasks/tripleo_container_stop.yaml diff --git a/tripleo_ansible/roles/tripleo-container-tag/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/defaults/main.yml rename to tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/meta/main.yml b/tripleo_ansible/roles/tripleo_container_tag/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/meta/main.yml rename to tripleo_ansible/roles/tripleo_container_tag/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/molecule.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/playbook.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/playbook.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/prepare.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/legacy_vars/prepare.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/podman/molecule.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/podman/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/podman/playbook.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/molecule/podman/prepare.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/molecule/podman/prepare.yml rename to tripleo_ansible/roles/tripleo_container_tag/molecule/podman/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-container-tag/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-container-tag/tasks/main.yml rename to tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/defaults/main.yml b/tripleo_ansible/roles/tripleo_create_admin/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/defaults/main.yml rename to tripleo_ansible/roles/tripleo_create_admin/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/meta/main.yml b/tripleo_ansible/roles/tripleo_create_admin/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/meta/main.yml rename to tripleo_ansible/roles/tripleo_create_admin/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-container-stop/molecule/podman/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-container-stop/molecule/podman/Dockerfile rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/playbook.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/prepare.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/prepare.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/tests/test_keyadd.py b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/tests/test_keyadd.py similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/tests/test_keyadd.py rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/tests/test_keyadd.py diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/verify.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/Dockerfile rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/tests/test_default.py rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/playbook.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/prepare.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/prepare.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/tests/test_keygen.py b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/tests/test_keygen.py similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/tests/test_keygen.py rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/tests/test_keygen.py diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/verify.yml rename to tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/tasks/authorize_user.yml b/tripleo_ansible/roles/tripleo_create_admin/tasks/authorize_user.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/tasks/authorize_user.yml rename to tripleo_ansible/roles/tripleo_create_admin/tasks/authorize_user.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/tasks/create_user.yml b/tripleo_ansible/roles/tripleo_create_admin/tasks/create_user.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/tasks/create_user.yml rename to tripleo_ansible/roles/tripleo_create_admin/tasks/create_user.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/tasks/main.yml b/tripleo_ansible/roles/tripleo_create_admin/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/tasks/main.yml rename to tripleo_ansible/roles/tripleo_create_admin/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo_docker_rm b/tripleo_ansible/roles/tripleo_docker_rm new file mode 120000 index 000000000..26535b189 --- /dev/null +++ b/tripleo_ansible/roles/tripleo_docker_rm @@ -0,0 +1 @@ +tripleo-container-rm \ No newline at end of file diff --git a/tripleo_ansible/roles/tripleo-firewall/defaults/main.yml b/tripleo_ansible/roles/tripleo_firewall/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/defaults/main.yml rename to tripleo_ansible/roles/tripleo_firewall/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/handlers/main.yml b/tripleo_ansible/roles/tripleo_firewall/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/handlers/main.yml rename to tripleo_ansible/roles/tripleo_firewall/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/meta/main.yml b/tripleo_ansible/roles/tripleo_firewall/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/meta/main.yml rename to tripleo_ansible/roles/tripleo_firewall/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/molecule.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/playbook.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/prepare.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add-complex/prepare.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/molecule.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/playbook.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/prepare.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-add/prepare.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/molecule.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/playbook.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/prepare.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove-complex/prepare.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/molecule.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/molecule.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/playbook.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/prepare.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/molecule/firewall-remove/prepare.yml rename to tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/tasks/main.yml b/tripleo_ansible/roles/tripleo_firewall/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/tasks/main.yml rename to tripleo_ansible/roles/tripleo_firewall/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/vars/main.yml b/tripleo_ansible/roles/tripleo_firewall/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/vars/main.yml rename to tripleo_ansible/roles/tripleo_firewall/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-firewall/vars/redhat.yml b/tripleo_ansible/roles/tripleo_firewall/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-firewall/vars/redhat.yml rename to tripleo_ansible/roles/tripleo_firewall/vars/redhat.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/defaults/main.yml b/tripleo_ansible/roles/tripleo_hieradata/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/defaults/main.yml rename to tripleo_ansible/roles/tripleo_hieradata/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/handlers/main.yml b/tripleo_ansible/roles/tripleo_hieradata/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/handlers/main.yml rename to tripleo_ansible/roles/tripleo_hieradata/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/meta/main.yml b/tripleo_ansible/roles/tripleo_hieradata/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/meta/main.yml rename to tripleo_ansible/roles/tripleo_hieradata/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/Dockerfile b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/Dockerfile rename to tripleo_ansible/roles/tripleo_hieradata/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/group_vars/overcloud.json b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/group_vars/overcloud.json similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/group_vars/overcloud.json rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/group_vars/overcloud.json diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/mock-hieradata.j2.yaml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/mock-hieradata.j2.yaml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/mock-hieradata.j2.yaml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/mock-hieradata.j2.yaml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/playbook.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/playbook.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/prepare.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/prepare.yml rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py rename to tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py diff --git a/tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml b/tripleo_ansible/roles/tripleo_hieradata/tasks/hieradata_vars.yaml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/tasks/hieradata_vars.yaml rename to tripleo_ansible/roles/tripleo_hieradata/tasks/hieradata_vars.yaml diff --git a/tripleo_ansible/roles/tripleo-hieradata/tasks/main.yml b/tripleo_ansible/roles/tripleo_hieradata/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/tasks/main.yml rename to tripleo_ansible/roles/tripleo_hieradata/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/all_nodes.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/all_nodes.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/bootstrap_node.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/bootstrap_node.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/bootstrap_node.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/bootstrap_node.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/cloud_domain.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/cloud_domain.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/cloud_domain.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/cloud_domain.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/extraconfig.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/extraconfig.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/extraconfig.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/extraconfig.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/fqdn.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/fqdn.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/net_ip_map.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/net_ip_map.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/role_extraconfig.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/role_extraconfig.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/role_extraconfig.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/role_extraconfig.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/service_configs.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/service_configs.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/service_configs.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/service_configs.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/service_names.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/service_names.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/service_names.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/service_names.j2 diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2 rename to tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/defaults/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/defaults/main.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/files/.gitkeep b/tripleo_ansible/roles/tripleo_hosts_entries/files/.gitkeep similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/files/.gitkeep rename to tripleo_ansible/roles/tripleo_hosts_entries/files/.gitkeep diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/handlers/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/handlers/main.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/meta/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/meta/main.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/Dockerfile b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/Dockerfile rename to tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/tasks/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/tasks/main.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/vars/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/vars/main.yml rename to tripleo_ansible/roles/tripleo_hosts_entries/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/defaults/main.yml b/tripleo_ansible/roles/tripleo_image_serve/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/defaults/main.yml rename to tripleo_ansible/roles/tripleo_image_serve/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/handlers/main.yml b/tripleo_ansible/roles/tripleo_image_serve/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/handlers/main.yml rename to tripleo_ansible/roles/tripleo_image_serve/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/meta/main.yml b/tripleo_ansible/roles/tripleo_image_serve/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/meta/main.yml rename to tripleo_ansible/roles/tripleo_image_serve/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_image_serve/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/default/tests/test_default.py rename to tripleo_ansible/roles/tripleo_image_serve/molecule/default/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/Dockerfile rename to tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/molecule.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/playbook.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/playbook.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/prepare.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/prepare.yml rename to tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/tests/test_default.py b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/molecule/legacy_vars/tests/test_default.py rename to tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-image-serve/tasks/main.yml b/tripleo_ansible/roles/tripleo_image_serve/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/tasks/main.yml rename to tripleo_ansible/roles/tripleo_image_serve/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-image-serve/templates/image-serve.conf.j2 b/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-image-serve/templates/image-serve.conf.j2 rename to tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2 diff --git a/tripleo_ansible/roles/tripleo-kernel/defaults/main.yml b/tripleo_ansible/roles/tripleo_kernel/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/defaults/main.yml rename to tripleo_ansible/roles/tripleo_kernel/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/handlers/main.yml b/tripleo_ansible/roles/tripleo_kernel/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/handlers/main.yml rename to tripleo_ansible/roles/tripleo_kernel/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/meta/main.yml b/tripleo_ansible/roles/tripleo_kernel/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/meta/main.yml rename to tripleo_ansible/roles/tripleo_kernel/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_kernel/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_kernel/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_kernel/molecule/extra/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/extra/molecule.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/extra/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/extra/playbook.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/prepare.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/extra/prepare.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/extra/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/extra/Dockerfile b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/extra/Dockerfile rename to tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/molecule.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/playbook.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/prepare.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/prepare.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/verify.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/verify.yml rename to tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/verify.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml b/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/tasks/kernelargs.yml rename to tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/main.yml b/tripleo_ansible/roles/tripleo_kernel/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/tasks/main.yml rename to tripleo_ansible/roles/tripleo_kernel/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml b/tripleo_ansible/roles/tripleo_kernel/tasks/reboot.yaml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml rename to tripleo_ansible/roles/tripleo_kernel/tasks/reboot.yaml diff --git a/tripleo_ansible/roles/tripleo-kernel/templates/tripleo-modprobe.conf.j2 b/tripleo_ansible/roles/tripleo_kernel/templates/tripleo-modprobe.conf.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/templates/tripleo-modprobe.conf.j2 rename to tripleo_ansible/roles/tripleo_kernel/templates/tripleo-modprobe.conf.j2 diff --git a/tripleo_ansible/roles/tripleo-kernel/templates/tripleo-sysctl.conf.j2 b/tripleo_ansible/roles/tripleo_kernel/templates/tripleo-sysctl.conf.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/templates/tripleo-sysctl.conf.j2 rename to tripleo_ansible/roles/tripleo_kernel/templates/tripleo-sysctl.conf.j2 diff --git a/tripleo_ansible/roles/tripleo-kernel/vars/main.yml b/tripleo_ansible/roles/tripleo_kernel/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/vars/main.yml rename to tripleo_ansible/roles/tripleo_kernel/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/defaults/main.yml b/tripleo_ansible/roles/tripleo_keystone_resources/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/defaults/main.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/meta/main.yml b/tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/meta/main.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile.keystone b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile.keystone similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/Dockerfile.keystone rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile.keystone diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/start_keystone.sh b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/start_keystone.sh rename to tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/start_keystone.sh diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/admin.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/admin.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/admin.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/admin.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/clouds.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/clouds.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/domains.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/domains.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/domains.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/endpoints.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/endpoints.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/endpoints.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/gather_domains_new.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/gather_domains_new.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/gather_domains_new.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/gather_domains_new.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/gather_domains_old.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/gather_domains_old.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/gather_domains_old.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/gather_domains_old.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/loop-endpoints.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/loop-endpoints.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/loop-endpoints.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/loop-endpoints.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/projects.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/projects.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/projects.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/roles.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/roles.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/roles.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/services.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/services.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/services.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/user_per_role.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_per_role.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/user_per_role.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_roles.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/user_roles.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/user_roles.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/user_roles.yml diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/users.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-keystone-resources/tasks/users.yml rename to tripleo_ansible/roles/tripleo_keystone_resources/tasks/users.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/defaults/main.yml b/tripleo_ansible/roles/tripleo_module_load/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/defaults/main.yml rename to tripleo_ansible/roles/tripleo_module_load/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/handlers/main.yml b/tripleo_ansible/roles/tripleo_module_load/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/handlers/main.yml rename to tripleo_ansible/roles/tripleo_module_load/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/meta/main.yml b/tripleo_ansible/roles/tripleo_module_load/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/meta/main.yml rename to tripleo_ansible/roles/tripleo_module_load/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-kernel/molecule/kernelargs/Dockerfile rename to tripleo_ansible/roles/tripleo_module_load/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/molecule.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/playbook.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/playbook.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/prepare.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/prepare.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/Dockerfile b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/legacy_vars/Dockerfile rename to tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/molecule.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/playbook.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/playbook.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/prepare.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/prepare.yml rename to tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/tasks/main.yml b/tripleo_ansible/roles/tripleo_module_load/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/tasks/main.yml rename to tripleo_ansible/roles/tripleo_module_load/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/templates/module-load.conf.j2 b/tripleo_ansible/roles/tripleo_module_load/templates/module-load.conf.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/templates/module-load.conf.j2 rename to tripleo_ansible/roles/tripleo_module_load/templates/module-load.conf.j2 diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/defaults/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/defaults/main.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/meta/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/meta/main.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/cache.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/cache.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/tasks/cache.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/tasks/cache.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/uncache.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/uncache.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/tasks/uncache.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/tasks/uncache.yml diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/vars/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-nova-image-cache/vars/main.yml rename to tripleo_ansible/roles/tripleo_nova_image_cache/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/defaults/main.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/defaults/main.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/library/openvswitch_db.py b/tripleo_ansible/roles/tripleo_ovs_dpdk/library/openvswitch_db.py similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/library/openvswitch_db.py rename to tripleo_ansible/roles/tripleo_ovs_dpdk/library/openvswitch_db.py diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/meta/main.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/meta/main.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/tests/test_default.py rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/Dockerfile b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/Dockerfile rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/playbook.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/playbook.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/prepare.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/prepare.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/tests/test_positive.py b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/tests/test_positive.py similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/tests/test_positive.py rename to tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/tests/test_positive.py diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/config.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/config.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/config.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/config.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/main.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/workarounds.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/workarounds.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ovs-dpdk/tasks/workarounds.yml rename to tripleo_ansible/roles/tripleo_ovs_dpdk/tasks/workarounds.yml diff --git a/tripleo_ansible/roles/tripleo-packages/defaults/main.yml b/tripleo_ansible/roles/tripleo_packages/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/defaults/main.yml rename to tripleo_ansible/roles/tripleo_packages/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-packages/handlers/main.yml b/tripleo_ansible/roles/tripleo_packages/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/handlers/main.yml rename to tripleo_ansible/roles/tripleo_packages/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-packages/meta/main.yml b/tripleo_ansible/roles/tripleo_packages/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/meta/main.yml rename to tripleo_ansible/roles/tripleo_packages/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-module-load/molecule/remove_module/Dockerfile rename to tripleo_ansible/roles/tripleo_packages/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/playbook.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/prepare.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/Dockerfile rename to tripleo_ansible/roles/tripleo_packages/molecule/ffu/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/ffu/playbook.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/ffu/prepare.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/update/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/ffu/Dockerfile rename to tripleo_ansible/roles/tripleo_packages/molecule/update/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/update/playbook.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/update/prepare.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/update/Dockerfile rename to tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/upgrade/playbook.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/upgrade/prepare.yml rename to tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/external_upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/tasks/external_upgrade.yml rename to tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_post_upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/fast_forward_post_upgrade.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_post_upgrade.yml rename to tripleo_ansible/roles/tripleo_packages/tasks/fast_forward_post_upgrade.yml diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/fast_forward_upgrade.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml rename to tripleo_ansible/roles/tripleo_packages/tasks/fast_forward_upgrade.yml diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/update.yml b/tripleo_ansible/roles/tripleo_packages/tasks/update.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/tasks/update.yml rename to tripleo_ansible/roles/tripleo_packages/tasks/update.yml diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml rename to tripleo_ansible/roles/tripleo_packages/tasks/upgrade.yml diff --git a/tripleo_ansible/roles/tripleo-persist/defaults/main.yml b/tripleo_ansible/roles/tripleo_persist/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/defaults/main.yml rename to tripleo_ansible/roles/tripleo_persist/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/Dockerfile b/tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-packages/molecule/upgrade/Dockerfile rename to tripleo_ansible/roles/tripleo_persist/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-persist/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-persist/tasks/cleanup.yml b/tripleo_ansible/roles/tripleo_persist/tasks/cleanup.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/tasks/cleanup.yml rename to tripleo_ansible/roles/tripleo_persist/tasks/cleanup.yml diff --git a/tripleo_ansible/roles/tripleo-persist/tasks/persist.yml b/tripleo_ansible/roles/tripleo_persist/tasks/persist.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/tasks/persist.yml rename to tripleo_ansible/roles/tripleo_persist/tasks/persist.yml diff --git a/tripleo_ansible/roles/tripleo-persist/tasks/restore.yml b/tripleo_ansible/roles/tripleo_persist/tasks/restore.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/tasks/restore.yml rename to tripleo_ansible/roles/tripleo_persist/tasks/restore.yml diff --git a/tripleo_ansible/roles/tripleo-podman/defaults/main.yml b/tripleo_ansible/roles/tripleo_podman/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/defaults/main.yml rename to tripleo_ansible/roles/tripleo_podman/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-podman/meta/main.yml b/tripleo_ansible/roles/tripleo_podman/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/meta/main.yml rename to tripleo_ansible/roles/tripleo_podman/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_podman/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_podman/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml b/tripleo_ansible/roles/tripleo_podman/molecule/install/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/install/molecule.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/install/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/install/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/install/playbook.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/install/prepare.yml b/tripleo_ansible/roles/tripleo_podman/molecule/install/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/install/prepare.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/install/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml b/tripleo_ansible/roles/tripleo_podman/molecule/login/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/login/molecule.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/login/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/login/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/login/playbook.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml b/tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml rename to tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/main.yml b/tripleo_ansible/roles/tripleo_podman/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/main.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_purge.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_purge.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_stop.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_stop.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_stop.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_stop.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_install.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_install.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_login.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_login.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_login.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_login.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_purge.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_purge.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_purge.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_purge.yml diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_rsyslog.yml b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_rsyslog.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_rsyslog.yml rename to tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_rsyslog.yml diff --git a/tripleo_ansible/roles/tripleo-podman/vars/redhat.yml b/tripleo_ansible/roles/tripleo_podman/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-podman/vars/redhat.yml rename to tripleo_ansible/roles/tripleo_podman/vars/redhat.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/defaults/main.yml b/tripleo_ansible/roles/tripleo_ptp/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/defaults/main.yml rename to tripleo_ansible/roles/tripleo_ptp/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/handlers/main.yml b/tripleo_ansible/roles/tripleo_ptp/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/handlers/main.yml rename to tripleo_ansible/roles/tripleo_ptp/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/meta/main.yml b/tripleo_ansible/roles/tripleo_ptp/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/meta/main.yml rename to tripleo_ansible/roles/tripleo_ptp/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-persist/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-persist/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ptp/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/playbook.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/playbook.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/prepare.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/prepare.yml rename to tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/main.yml b/tripleo_ansible/roles/tripleo_ptp/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ptp/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ntp_stop.yml b/tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_ntp_stop.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ntp_stop.yml rename to tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_ntp_stop.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_phc2sys.yml b/tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_phc2sys.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_phc2sys.yml rename to tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_phc2sys.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml b/tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_ptp.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml rename to tripleo_ansible/roles/tripleo_ptp/tasks/tripleo_ptp.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/templates/ptp4l.conf.j2 b/tripleo_ansible/roles/tripleo_ptp/templates/ptp4l.conf.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/templates/ptp4l.conf.j2 rename to tripleo_ansible/roles/tripleo_ptp/templates/ptp4l.conf.j2 diff --git a/tripleo_ansible/roles/tripleo-ptp/vars/redhat.yml b/tripleo_ansible/roles/tripleo_ptp/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/vars/redhat.yml rename to tripleo_ansible/roles/tripleo_ptp/vars/redhat.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/defaults/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/defaults/main.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/meta/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/meta/main.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/Dockerfile b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/Dockerfile rename to tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/tasks/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/tasks/main.yml rename to tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/defaults/main.yml b/tripleo_ansible/roles/tripleo_securetty/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/defaults/main.yml rename to tripleo_ansible/roles/tripleo_securetty/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/meta/main.yml b/tripleo_ansible/roles/tripleo_securetty/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/meta/main.yml rename to tripleo_ansible/roles/tripleo_securetty/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-puppet-cache/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_securetty/molecule/create/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/playbook.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/create/playbook.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/create/prepare.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/create/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/Dockerfile b/tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/create/Dockerfile rename to tripleo_ansible/roles/tripleo_securetty/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_securetty/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/tasks/main.yml b/tripleo_ansible/roles/tripleo_securetty/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/tasks/main.yml rename to tripleo_ansible/roles/tripleo_securetty/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/templates/securetty.j2 b/tripleo_ansible/roles/tripleo_securetty/templates/securetty.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/templates/securetty.j2 rename to tripleo_ansible/roles/tripleo_securetty/templates/securetty.j2 diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/defaults/main.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/defaults/main.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/meta/main.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/meta/main.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-securetty/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/tests/test_default.py rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml rename to tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/defaults/main.yml b/tripleo_ansible/roles/tripleo_sshd/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/defaults/main.yml rename to tripleo_ansible/roles/tripleo_sshd/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/handlers/main.yml b/tripleo_ansible/roles/tripleo_sshd/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/handlers/main.yml rename to tripleo_ansible/roles/tripleo_sshd/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/meta/main.yml b/tripleo_ansible/roles/tripleo_sshd/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/meta/main.yml rename to tripleo_ansible/roles/tripleo_sshd/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-ssh-known-hosts/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_sshd/molecule/banners/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml rename to tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/playbook.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/banners/playbook.yml rename to tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/Dockerfile b/tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/banners/Dockerfile rename to tripleo_ansible/roles/tripleo_sshd/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/tasks/main.yml b/tripleo_ansible/roles/tripleo_sshd/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/tasks/main.yml rename to tripleo_ansible/roles/tripleo_sshd/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/templates/sshd_config_block.j2 b/tripleo_ansible/roles/tripleo_sshd/templates/sshd_config_block.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/templates/sshd_config_block.j2 rename to tripleo_ansible/roles/tripleo_sshd/templates/sshd_config_block.j2 diff --git a/tripleo_ansible/roles/tripleo-sshd/vars/main.yml b/tripleo_ansible/roles/tripleo_sshd/vars/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/vars/main.yml rename to tripleo_ansible/roles/tripleo_sshd/vars/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/vars/redhat.yml b/tripleo_ansible/roles/tripleo_sshd/vars/redhat.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/vars/redhat.yml rename to tripleo_ansible/roles/tripleo_sshd/vars/redhat.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/defaults/main.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/meta/main.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/meta/main.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-sshd/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml rename to tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service.path.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service.path.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service.path.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service.path.j2 diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service.service.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service.service.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service.service.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service.service.j2 diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_command.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_command.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_command.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_command.j2 diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_kill.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_kill.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_kill.j2 diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_sync.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_sync.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_sync.j2 diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_wrapper.j2 b/tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_wrapper.j2 similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/templates/service_wrapper.j2 rename to tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_wrapper.j2 diff --git a/tripleo_ansible/roles/tripleo-timezone/defaults/main.yml b/tripleo_ansible/roles/tripleo_timezone/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/defaults/main.yml rename to tripleo_ansible/roles/tripleo_timezone/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/handlers/main.yml b/tripleo_ansible/roles/tripleo_timezone/handlers/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/handlers/main.yml rename to tripleo_ansible/roles/tripleo_timezone/handlers/main.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/meta/main.yml b/tripleo_ansible/roles/tripleo_timezone/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/meta/main.yml rename to tripleo_ansible/roles/tripleo_timezone/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_timezone/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/tasks/main.yml b/tripleo_ansible/roles/tripleo_timezone/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/tasks/main.yml rename to tripleo_ansible/roles/tripleo_timezone/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/defaults/main.yml b/tripleo_ansible/roles/tripleo_transfer/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/defaults/main.yml rename to tripleo_ansible/roles/tripleo_transfer/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/meta/main.yml b/tripleo_ansible/roles/tripleo_transfer/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/meta/main.yml rename to tripleo_ansible/roles/tripleo_transfer/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_transfer/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-timezone/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_transfer/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_transfer/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/tasks/cleanup.yml b/tripleo_ansible/roles/tripleo_transfer/tasks/cleanup.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/tasks/cleanup.yml rename to tripleo_ansible/roles/tripleo_transfer/tasks/cleanup.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/tasks/flag.yml b/tripleo_ansible/roles/tripleo_transfer/tasks/flag.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/tasks/flag.yml rename to tripleo_ansible/roles/tripleo_transfer/tasks/flag.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/tasks/main.yml b/tripleo_ansible/roles/tripleo_transfer/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/tasks/main.yml rename to tripleo_ansible/roles/tripleo_transfer/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/defaults/main.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/defaults/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/defaults/main.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/defaults/main.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/meta/main.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/meta/main.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-transfer/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/create-tripleo-upgrade-file.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/create-tripleo-upgrade-file.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/create-tripleo-upgrade-file.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/create-tripleo-upgrade-file.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/main.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/main.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/main.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/remove-all.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/remove-all.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/remove-all.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/remove-all.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/remove.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/remove.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/remove.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/remove.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/set.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/set.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/tasks/set.yml rename to tripleo_ansible/roles/tripleo_upgrade_hiera/tasks/set.yml diff --git a/tripleo_ansible/roles/tripleo-validations-package/meta/main.yml b/tripleo_ansible/roles/tripleo_validations_package/meta/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-validations-package/meta/main.yml rename to tripleo_ansible/roles/tripleo_validations_package/meta/main.yml diff --git a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/Dockerfile b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile similarity index 100% rename from tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/Dockerfile rename to tripleo_ansible/roles/tripleo_validations_package/molecule/default/Dockerfile diff --git a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml rename to tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml diff --git a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-validations-package/molecule/default/playbook.yml rename to tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml diff --git a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-validations-package/molecule/default/prepare.yml rename to tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml diff --git a/tripleo_ansible/roles/tripleo-validations-package/tasks/main.yml b/tripleo_ansible/roles/tripleo_validations_package/tasks/main.yml similarity index 100% rename from tripleo_ansible/roles/tripleo-validations-package/tasks/main.yml rename to tripleo_ansible/roles/tripleo_validations_package/tasks/main.yml