From 4c2d54e95ca899944101fd45406cf23da0ae8522 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 20 Jan 2020 10:15:23 -0600 Subject: [PATCH] Replace all references to the old role name This change replaces all of the roles references in our various files with the new role name. This is being done because Ansible no longer allows hyphens in role names. Change-Id: Ie899714aca49781ccd240bb259901d76f177d2ae Signed-off-by: Kevin Carter --- tripleo_ansible/playbooks/ceph.yaml | 4 ++-- .../playbooks/create-nova-cell-v2.yaml | 10 ++++----- .../playbooks/docker-vfs-setup.yml | 4 ++-- tripleo_ansible/playbooks/octavia-files.yaml | 8 +++---- .../playbooks/tripleo_nova_image_cache.yml | 2 +- .../backup_and_restore/backup/tasks/main.yml | 2 +- .../roles/backup_and_restore/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../setup_nfs/tasks/main.yml | 2 +- .../setup_rear/tasks/main.yml | 2 +- .../roles/backup_and_restore/tasks/main.yml | 2 +- .../backup_and_restore/tasks/setup_nfs.yml | 2 +- .../backup_and_restore/tasks/setup_rear.yml | 2 +- .../backup_and_restore/templates/exports.j2 | 2 +- .../templates/local.conf.j2 | 2 +- .../templates/rescue.conf.j2 | 2 +- .../roles/login_defs/meta/main.yml | 2 +- .../login_defs/molecule/default/playbook.yml | 2 +- .../roles/login_defs/tasks/main.yml | 2 +- .../octavia_controller_config/meta/main.yml | 2 +- .../octavia_overcloud_config/meta/main.yml | 2 +- .../roles/octavia_undercloud/meta/main.yml | 2 +- .../roles/tripleo_bootstrap/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_bootstrap/tasks/main.yml | 2 +- .../roles/tripleo_cellv2/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_ceph_fetch_dir/meta/main.yml | 6 ++--- .../molecule/default/playbook.yml | 2 +- .../tripleo_ceph_run_ansible/meta/main.yml | 10 ++++----- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_ceph_uuid/meta/main.yml | 6 ++--- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_ceph_work_dir/meta/main.yml | 4 ++-- .../molecule/default/playbook.yml | 2 +- .../tripleo_clients_install/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tasks/install_pkgs.yml | 2 +- .../roles/tripleo_config/defaults/main.yml | 2 +- .../roles/tripleo_config/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 4 ++-- .../meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tasks/main.yml | 4 ++-- .../tripleo_container_manage/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_container_manage/tasks/main.yml | 6 ++--- .../roles/tripleo_container_rm/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/docker_rm/playbook.yml | 6 ++--- .../molecule/legacy_vars/playbook.yml | 2 +- .../molecule/podman-rm-stopped/playbook.yml | 2 +- .../molecule/podman/playbook.yml | 2 +- .../tripleo_container_stop/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/podman/playbook.yml | 2 +- .../tripleo_container_stop/tasks/main.yml | 2 +- .../tripleo_container_tag/defaults/main.yml | 2 +- .../roles/tripleo_container_tag/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 4 ++-- .../molecule/legacy_vars/playbook.yml | 4 ++-- .../molecule/podman/playbook.yml | 4 ++-- .../tripleo_container_tag/tasks/main.yml | 2 +- .../roles/tripleo_create_admin/meta/main.yml | 2 +- .../molecule/addkey/playbook.yml | 4 ++-- .../molecule/default/playbook.yml | 2 +- .../molecule/keygen/playbook.yml | 2 +- .../roles/tripleo_firewall/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../firewall-add-complex/playbook.yml | 2 +- .../molecule/firewall-add/playbook.yml | 2 +- .../firewall-remove-complex/playbook.yml | 2 +- .../molecule/firewall-remove/playbook.yml | 2 +- .../roles/tripleo_firewall/tasks/main.yml | 2 +- .../roles/tripleo_hieradata/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/hieradata_vars/playbook.yml | 2 +- .../roles/tripleo_hosts_entries/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_image_serve/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/legacy_vars/playbook.yml | 2 +- .../roles/tripleo_kernel/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/extra/playbook.yml | 2 +- .../molecule/kernelargs/playbook.yml | 2 +- .../roles/tripleo_kernel/tasks/kernelargs.yml | 4 ++-- .../roles/tripleo_kernel/tasks/main.yml | 2 +- .../tripleo_keystone_resources/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 4 ++-- .../tasks/clouds.yml | 2 +- .../tripleo_keystone_resources/tasks/main.yml | 2 +- .../roles/tripleo_module_load/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/legacy_vars/playbook.yml | 2 +- .../molecule/remove_module/playbook.yml | 4 ++-- .../roles/tripleo_module_load/tasks/main.yml | 2 +- .../tripleo_nova_image_cache/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_nova_image_cache/tasks/main.yml | 2 +- .../roles/tripleo_ovs_dpdk/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 4 ++-- .../molecule/positive/playbook.yml | 2 +- .../roles/tripleo_packages/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/external_upgrade/playbook.yml | 2 +- .../molecule/ffu/playbook.yml | 4 ++-- .../molecule/update/playbook.yml | 2 +- .../molecule/upgrade/playbook.yml | 8 +++---- .../tasks/external_upgrade.yml | 4 ++-- .../molecule/default/playbook.yml | 6 ++--- .../roles/tripleo_podman/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/install/playbook.yml | 2 +- .../molecule/login/playbook.yml | 2 +- .../tripleo_podman/molecule/login/prepare.yml | 2 +- .../roles/tripleo_podman/tasks/main.yml | 2 +- .../roles/tripleo_ptp/meta/main.yml | 4 ++-- .../tripleo_ptp/molecule/default/playbook.yml | 2 +- .../molecule/ntp_stop/playbook.yml | 2 +- .../roles/tripleo_ptp/tasks/main.yml | 2 +- .../roles/tripleo_puppet_cache/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_puppet_cache/tasks/main.yml | 2 +- .../roles/tripleo_securetty/meta/main.yml | 2 +- .../molecule/create/playbook.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_ssh_known_hosts/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../molecule/banners/playbook.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_systemd_wrapper/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../tripleo_systemd_wrapper/tasks/main.yml | 2 +- .../roles/tripleo_timezone/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_timezone/tasks/main.yml | 2 +- .../roles/tripleo_transfer/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- .../roles/tripleo_upgrade_hiera/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 22 +++++++++---------- .../tripleo_validations_package/meta/main.yml | 2 +- .../molecule/default/playbook.yml | 2 +- 144 files changed, 194 insertions(+), 194 deletions(-) diff --git a/tripleo_ansible/playbooks/ceph.yaml b/tripleo_ansible/playbooks/ceph.yaml index 7519a0423..bdcea4b87 100644 --- a/tripleo_ansible/playbooks/ceph.yaml +++ b/tripleo_ansible/playbooks/ceph.yaml @@ -16,9 +16,9 @@ - hosts: Undercloud roles: - - role: tripleo-ceph-run-ansible + - role: tripleo_ceph_run_ansible post_tasks: - name: backup and clean fetch directory after ceph-ansible run include_role: - name: tripleo-ceph-fetch-dir + name: tripleo_ceph_fetch_dir tasks_from: backup_and_clean diff --git a/tripleo_ansible/playbooks/create-nova-cell-v2.yaml b/tripleo_ansible/playbooks/create-nova-cell-v2.yaml index 1f4395ba1..c73e2b5ce 100644 --- a/tripleo_ansible/playbooks/create-nova-cell-v2.yaml +++ b/tripleo_ansible/playbooks/create-nova-cell-v2.yaml @@ -24,7 +24,7 @@ tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}" tasks: - import_role: - name: tripleo-cellv2 + name: tripleo_cellv2 tasks_from: check_cell_exist.yml - hosts: CellController[0] @@ -37,7 +37,7 @@ tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}" tasks: - import_role: - name: tripleo-cellv2 + name: tripleo_cellv2 tasks_from: extract_cell_information.yml - hosts: Controller[0] @@ -50,7 +50,7 @@ tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}" tasks: - import_role: - name: tripleo-cellv2 + name: tripleo_cellv2 tasks_from: create_cell.yml - hosts: Controller @@ -63,7 +63,7 @@ tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}" tasks: - import_role: - name: tripleo-cellv2 + name: tripleo_cellv2 tasks_from: add_internalapi_hosts_entries.yml - hosts: Controller[0] @@ -76,5 +76,5 @@ tripleo_cellv2_cellcontroller_group: "{{ groups['CellController'] }}" tasks: - import_role: - name: tripleo-cellv2 + name: tripleo_cellv2 tasks_from: discover_hosts.yml diff --git a/tripleo_ansible/playbooks/docker-vfs-setup.yml b/tripleo_ansible/playbooks/docker-vfs-setup.yml index 892dfce6d..6e8857d57 100644 --- a/tripleo_ansible/playbooks/docker-vfs-setup.yml +++ b/tripleo_ansible/playbooks/docker-vfs-setup.yml @@ -73,7 +73,7 @@ - name: Insert storage-driver into docker daemon config (existing) include_role: - name: tripleo-config + name: tripleo_config vars: tripleo_config_src: "{{ tripleo_docker_temp_file }}" tripleo_config_type: json @@ -85,7 +85,7 @@ - name: Insert storage-driver into docker daemon config (new) include_role: - name: tripleo-config + name: tripleo_config vars: tripleo_config_type: json tripleo_config_dest: /etc/docker/daemon.json diff --git a/tripleo_ansible/playbooks/octavia-files.yaml b/tripleo_ansible/playbooks/octavia-files.yaml index 08b9b5e63..3b2659b2a 100644 --- a/tripleo_ansible/playbooks/octavia-files.yaml +++ b/tripleo_ansible/playbooks/octavia-files.yaml @@ -24,7 +24,7 @@ OS_IMAGE_API_VERSION: "2" OS_AUTH_TYPE: "{{ os_auth_type }}" roles: - - octavia-undercloud + - octavia_undercloud - hosts: octavia_nodes[0] gather_facts: true @@ -55,7 +55,7 @@ OS_IMAGE_API_VERSION: "2" OS_AUTH_TYPE: "{{ os_auth_type }}" roles: - - octavia-overcloud-config + - octavia_overcloud_config - hosts: octavia_nodes gather_facts: true @@ -88,7 +88,7 @@ OS_IMAGE_API_VERSION: "2" OS_AUTH_TYPE: "{{ os_auth_type }}" roles: - - octavia-controller-config + - octavia_controller_config - hosts: octavia_nodes gather_facts: true @@ -96,4 +96,4 @@ octavia_confd_prefix: "/var/lib/config-data/puppet-generated/octavia" container_cli: "{{ container_cli }}" roles: - - octavia-controller-post-config + - octavia_controller_post_config diff --git a/tripleo_ansible/playbooks/tripleo_nova_image_cache.yml b/tripleo_ansible/playbooks/tripleo_nova_image_cache.yml index ef960db0a..07e1244e8 100644 --- a/tripleo_ansible/playbooks/tripleo_nova_image_cache.yml +++ b/tripleo_ansible/playbooks/tripleo_nova_image_cache.yml @@ -34,7 +34,7 @@ OS_VOLUME_API_VERSION: "{{ lookup('env', 'OS_VOLUME_API_VERSION') }}" OS_REGION_NAME: "{{ lookup('env', 'OS_REGION_NAME') }}" roles: - - role: tripleo-nova-image-cache + - role: tripleo_nova_image_cache # Standard inventory: # diff --git a/tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml index ae1c8a473..b4bed318c 100644 --- a/tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/backup_and_restore/meta/main.yml b/tripleo_ansible/roles/backup_and_restore/meta/main.yml index 829d49762..d5ae1b2b5 100644 --- a/tripleo_ansible/roles/backup_and_restore/meta/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- backup-and-restore + description: TripleO OpenStack Role -- backup_and_restore company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml index 8feba4ef1..048ad31c9 100644 --- a/tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: backup-and-restore + - role: backup_and_restore tripleo_backup_and_restore_nfs_server: undercloud tripleo_backup_and_restore_rear_simulate: true tripleo_backup_and_restore_hiera_config_file: "{{ ansible_user_dir }}/hiera.yaml" 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 index c4d5a361e..ce68062c9 100644 --- a/tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system 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 index d1dc0ebbd..e02dd2fd6 100644 --- a/tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/main.yml b/tripleo_ansible/roles/backup_and_restore/tasks/main.yml index 5163f82ff..5b9709a3e 100644 --- a/tripleo_ansible/roles/backup_and_restore/tasks/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml index 9af256748..309d71f0a 100644 --- a/tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml +++ b/tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml index abbf8dbdf..e0c145773 100644 --- a/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml +++ b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml @@ -15,7 +15,7 @@ # under the License. -# "backup-and-restore" will search for and load any operating system variable file +# "backup_and_restore" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/backup_and_restore/templates/exports.j2 b/tripleo_ansible/roles/backup_and_restore/templates/exports.j2 index 6c3a43b2e..96572ad36 100644 --- a/tripleo_ansible/roles/backup_and_restore/templates/exports.j2 +++ b/tripleo_ansible/roles/backup_and_restore/templates/exports.j2 @@ -1,5 +1,5 @@ # This configuration file is generated automatically -# by the backup-and-restore role part of TripleO +# by the backup_and_restore role part of TripleO # Ansible. No not edit this file, all changes # will be lost. Refer to the following URL for # more information and implementation details: diff --git a/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 b/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 index aa4d901ef..ed4b43644 100644 --- a/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 +++ b/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 @@ -1,5 +1,5 @@ # This configuration file is generated automatically -# by the backup-and-restore role part of TripleO +# by the backup_and_restore role part of TripleO # Ansible. No not edit this file, all changes # will be lost. Refer to the following URL for # more information and implementation details: diff --git a/tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 b/tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 index 31b5fa066..0f75f0c4d 100644 --- a/tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 +++ b/tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2 @@ -1,5 +1,5 @@ # This configuration file is generated automatically -# by the backup-and-restore role part of TripleO +# by the backup_and_restore role part of TripleO # Ansible. No not edit this file, all changes # will be lost. Refer to the following URL for # more information and implementation details: diff --git a/tripleo_ansible/roles/login_defs/meta/main.yml b/tripleo_ansible/roles/login_defs/meta/main.yml index f3f15f74c..59b4d19bb 100644 --- a/tripleo_ansible/roles/login_defs/meta/main.yml +++ b/tripleo_ansible/roles/login_defs/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- login-defs + description: TripleO OpenStack Role -- login_defs company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/login_defs/molecule/default/playbook.yml b/tripleo_ansible/roles/login_defs/molecule/default/playbook.yml index da511b2e3..e104e3517 100644 --- a/tripleo_ansible/roles/login_defs/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/login_defs/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "login-defs" + - role: "login_defs" diff --git a/tripleo_ansible/roles/login_defs/tasks/main.yml b/tripleo_ansible/roles/login_defs/tasks/main.yml index 20ae025a8..29abb24e8 100644 --- a/tripleo_ansible/roles/login_defs/tasks/main.yml +++ b/tripleo_ansible/roles/login_defs/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "login-defs" will search for and load any operating system variable file +# "login_defs" will search for and load any operating system variable file - name: Install shadow-utils package: diff --git a/tripleo_ansible/roles/octavia_controller_config/meta/main.yml b/tripleo_ansible/roles/octavia_controller_config/meta/main.yml index 6f32a98ac..3b6c3e3e7 100644 --- a/tripleo_ansible/roles/octavia_controller_config/meta/main.yml +++ b/tripleo_ansible/roles/octavia_controller_config/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- octavia-controller-config + description: TripleO OpenStack Role -- octavia_controller_config company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml b/tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml index 3877b2996..e1d8a8d8b 100644 --- a/tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml +++ b/tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- octavia-overcloud-config + description: TripleO OpenStack Role -- octavia_overcloud_config company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/octavia_undercloud/meta/main.yml b/tripleo_ansible/roles/octavia_undercloud/meta/main.yml index 2641c141f..7e50b2533 100644 --- a/tripleo_ansible/roles/octavia_undercloud/meta/main.yml +++ b/tripleo_ansible/roles/octavia_undercloud/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- octavia-undercloud + description: TripleO OpenStack Role -- octavia_undercloud company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml index 089552ab8..7a1ad1005 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-bootstrap + description: TripleO OpenStack Role -- tripleo_bootstrap company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml index 9b3c8c411..ddec34613 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-bootstrap" + - role: "tripleo_bootstrap" diff --git a/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml b/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml index 4a2893364..d62fe453b 100644 --- a/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-bootstrap" will search for and load any operating system variable file +# "tripleo_bootstrap" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_cellv2/meta/main.yml b/tripleo_ansible/roles/tripleo_cellv2/meta/main.yml index f4af2ea9f..f7c6cfa90 100644 --- a/tripleo_ansible/roles/tripleo_cellv2/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_cellv2/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-cellv2 + description: TripleO OpenStack Role -- tripleo_cellv2 company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml index 81805ea54..2e3e09ceb 100644 --- a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-cellv2" + - role: "tripleo_cellv2" diff --git a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml index c6ede4789..1f7f05c49 100644 --- a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ceph-common" + - role: "tripleo_ceph_common" diff --git a/tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml index b9c85870f..052cd0936 100644 --- a/tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ceph-fetch-dir + description: TripleO OpenStack Role -- tripleo_ceph_fetch_dir company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 @@ -39,9 +39,9 @@ galaxy_info: - tripleo dependencies: - - role: tripleo-ceph-common + - role: tripleo_ceph_common when: - ceph_common_done is undefined - - role: tripleo-ceph-work-dir + - role: tripleo_ceph_work_dir when: - ceph_ansible_private_key_file is undefined 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 index de9b89a1a..c8a0f2675 100644 --- a/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ceph-fetch-dir" + - role: "tripleo_ceph_fetch_dir" diff --git a/tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml index d9de105a3..8486243a1 100644 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ceph-run-ansible + description: TripleO OpenStack Role -- tripleo_ceph_run_ansible company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 @@ -39,15 +39,15 @@ galaxy_info: - tripleo dependencies: - - role: tripleo-ceph-common + - role: tripleo_ceph_common when: - ceph_common_done is undefined - - role: tripleo-ceph-work-dir + - role: tripleo_ceph_work_dir when: - ceph_ansible_private_key_file is undefined - - role: tripleo-ceph-fetch-dir + - role: tripleo_ceph_fetch_dir when: - ceph_node_cleaned is undefined - - role: tripleo-ceph-uuid + - role: tripleo_ceph_uuid when: - (nodes_uuid_list is undefined) or (nodes_data is undefined) 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 index c311b0339..ffac5f4be 100644 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ceph-run-ansible" + - role: "tripleo_ceph_run_ansible" diff --git a/tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml index a88a2c279..6af08c032 100644 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ceph-uuid + description: TripleO OpenStack Role -- tripleo_ceph_uuid company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 @@ -39,9 +39,9 @@ galaxy_info: - tripleo dependencies: - - role: tripleo-ceph-common + - role: tripleo_ceph_common when: - ceph_common_done is undefined - - role: tripleo-ceph-work-dir + - role: tripleo_ceph_work_dir when: - ceph_ansible_private_key_file is undefined diff --git a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml index a98cc009a..d3239d852 100644 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ceph-uuid" + - role: "tripleo_ceph_uuid" diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml index 3c7ee3db3..e85ec523a 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ceph-work-dir + description: TripleO OpenStack Role -- tripleo_ceph_work_dir company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 @@ -39,6 +39,6 @@ galaxy_info: - tripleo dependencies: - - role: tripleo-ceph-common + - role: tripleo_ceph_common when: - ceph_common_done is undefined 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 index b2524ee5a..f2adfa64b 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ceph-work-dir" + - role: "tripleo_ceph_work_dir" diff --git a/tripleo_ansible/roles/tripleo_clients_install/meta/main.yml b/tripleo_ansible/roles/tripleo_clients_install/meta/main.yml index 5369e628d..5c65bbd3e 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-clients-install + description: TripleO OpenStack Role -- tripleo_clients_install company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml index 7654a19b7..b592268b4 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml @@ -22,4 +22,4 @@ aodh: installed barbican: installed roles: - - role: "tripleo-clients-install" + - role: "tripleo_clients_install" diff --git a/tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml b/tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml index 37de7fe81..ec4ece51f 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-clients-install" will search for and load any operating system variable file +# "tripleo_clients_install" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_config/defaults/main.yml b/tripleo_ansible/roles/tripleo_config/defaults/main.yml index 24039a969..6d6bd8f7d 100644 --- a/tripleo_ansible/roles/tripleo_config/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_config/defaults/main.yml @@ -17,7 +17,7 @@ # All variables intended for modification should be placed in this file. -# All variables within this role should have a prefix of "tripleo-config" +# All variables within this role should have a prefix of "tripleo_config" tripleo_config_type: ini tripleo_config_src: "{{ tripleo_config_type }}-config.j2" tripleo_config_owner: root diff --git a/tripleo_ansible/roles/tripleo_config/meta/main.yml b/tripleo_ansible/roles/tripleo_config/meta/main.yml index b8898ccf8..033c40fb1 100644 --- a/tripleo_ansible/roles/tripleo_config/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_config/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-config + description: TripleO OpenStack Role -- tripleo_config company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml index 77d754f52..43aad6b78 100644 --- a/tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml @@ -18,10 +18,10 @@ - name: Converge hosts: all roles: - - role: "tripleo-config" + - role: "tripleo_config" tripleo_config_dest: /tmp/test.ini - - role: "tripleo-config" + - role: "tripleo_config" tripleo_config_dest: /tmp/test2.ini tripleo_config_overrides: testSection: diff --git a/tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml index 988796342..009c84a02 100644 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-container-image-prepare + description: TripleO OpenStack Role -- tripleo_container_image_prepare company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 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 index 4f9382ad9..fc5e29495 100644 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-container-image-prepare" + - role: "tripleo_container_image_prepare" diff --git a/tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml index 288b44487..db90516da 100644 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-container-image-prepare" will search for and load any operating system variable file +# "tripleo_container_image_prepare" will search for and load any operating system variable file - name: Container image prepare become: true block: @@ -47,7 +47,7 @@ dest: "{{ role_data.path }}" content: "{{ tripleo_container_image_prepare_roles }}" - - name: "Run tripleo-container-image-prepare logged to: {{ tripleo_container_image_prepare_log_file }}" + - name: "Run tripleo_container_image_prepare logged to: {{ tripleo_container_image_prepare_log_file }}" command: >- /usr/bin/tripleo-container-image-prepare --roles-file {{ role_data.path }} diff --git a/tripleo_ansible/roles/tripleo_container_manage/meta/main.yml b/tripleo_ansible/roles/tripleo_container_manage/meta/main.yml index 787b78ece..90f27f6c0 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-container-manage + description: TripleO OpenStack Role -- tripleo_container_manage company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml index 4c1c4802b..717e71723 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml @@ -25,7 +25,7 @@ tripleo_container_manage_systemd_order: true tasks: - include_role: - name: tripleo-container-manage + name: tripleo_container_manage post_tasks: - name: Verify that Fedora container was created correctly become: true diff --git a/tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml index 768588228..bdec5227b 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-container-manage" will search for and load any operating system variable file +# "tripleo_container_manage" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system @@ -44,9 +44,9 @@ copy: dest: "{{ tripleo_container_manage_config | dirname }}/.ansible-managed" content: | - Containers are managed by the tripleo-container-manage role in + Containers are managed by the tripleo_container_manage role in tripleo-ansible project. This file is used by paunch to show a warning - if paunch is used against a deployment done with tripleo-container-manage. + if paunch is used against a deployment done with tripleo_container_manage. - name: Generate containers configs data no_log: "{{ false if tripleo_container_manage_debug else true }}" diff --git a/tripleo_ansible/roles/tripleo_container_rm/meta/main.yml b/tripleo_ansible/roles/tripleo_container_rm/meta/main.yml index e30b49abb..a582f9eeb 100644 --- a/tripleo_ansible/roles/tripleo_container_rm/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_container_rm/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-container-rm + description: TripleO OpenStack Role -- tripleo_container_rm company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml index afbe96bd9..790034e76 100644 --- a/tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-rm + - role: tripleo_container_rm tripleo_containers_to_rm: - docker-container1 - docker-container2 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 index d664f416e..cfe514cd4 100644 --- a/tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/playbook.yml @@ -15,15 +15,15 @@ # under the License. -# NOTE(Cloudnull): This role is a linked role to `tripleo-container-rm`. This role and exists +# NOTE(Cloudnull): This role is a linked role to `tripleo_container_rm`. This role and exists # to ensure we're providing a stable interface as we transition. In a future # release this link will be removed in favor of using the stable role, -# `tripleo-container-rm`. +# `tripleo_container_rm`. - name: Converge become: true hosts: all roles: - - role: tripleo-docker-rm + - role: tripleo_container_rm container_cli: docker containers_to_rm: - docker-container1 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 index 2d9d3bc3d..6f7ca4ba4 100644 --- a/tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-rm + - role: tripleo_container_rm container_cli: podman containers_to_rm: - podman-legacy-container1 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 index 9ca7cb89f..2d0ecd166 100644 --- 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 @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-rm + - role: tripleo_container_rm tripleo_container_cli: podman tripleo_containers_to_rm: - podman-container1 diff --git a/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml index 9ca7cb89f..2d0ecd166 100644 --- a/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-rm + - role: tripleo_container_rm tripleo_container_cli: podman tripleo_containers_to_rm: - podman-container1 diff --git a/tripleo_ansible/roles/tripleo_container_stop/meta/main.yml b/tripleo_ansible/roles/tripleo_container_stop/meta/main.yml index 474e90493..a808c6fc5 100644 --- a/tripleo_ansible/roles/tripleo_container_stop/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_container_stop/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-container-stop + description: TripleO OpenStack Role -- tripleo_container_stop company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml index 24e1a8259..4a479245a 100644 --- a/tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-stop + - role: tripleo_container_stop tripleo_containers_to_stop: - docker-container1 - docker-container2 diff --git a/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml index 0cf1d36f3..c091f6f8d 100644 --- a/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml @@ -19,7 +19,7 @@ become: true hosts: all roles: - - role: tripleo-container-stop + - role: tripleo_container_stop tripleo_containers_to_stop: - podman-container1 - podman-container2 diff --git a/tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml index 35a08e9e9..7baad396f 100644 --- a/tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-container-stop" will search for and load any operating system variable file +# "tripleo_container_stop" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. diff --git a/tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml index 8b98bb6d9..0c4e67e01 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml @@ -17,7 +17,7 @@ # All variables intended for modification should be placed in this file. -# All variables within this role should have a prefix of "tripleo-container-tag" +# All variables within this role should have a prefix of "tripleo_container_tag" # NOTE(cloudnull): This role used to use a non-namespaced option, which has a high # probability of creating conflicts with other roles in the greater diff --git a/tripleo_ansible/roles/tripleo_container_tag/meta/main.yml b/tripleo_ansible/roles/tripleo_container_tag/meta/main.yml index b0936bb05..7cb5faf68 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-container-tag + description: TripleO OpenStack Role -- tripleo_container_tag company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml index 9c9529931..84941b6bc 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml @@ -19,12 +19,12 @@ become: true hosts: all roles: - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" tripleo_container_image: centos:8 tripleo_container_image_latest: test-latest tripleo_container_cli: docker tripleo_container_pull_image: true - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" tripleo_container_image: centos:8 tripleo_container_image_latest: test-latest-2 tripleo_container_cli: docker 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 index c33079f2e..a0fd56c8b 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/playbook.yml @@ -19,11 +19,11 @@ hosts: all become: true roles: - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" container_image: centos:8 container_image_latest: test-latest container_cli: podman - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" container_image: centos:8 container_image_latest: test-latest-2 container_cli: podman diff --git a/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml b/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml index 7169f9684..05fc6ee16 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml @@ -19,11 +19,11 @@ hosts: all become: true roles: - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" tripleo_container_image: centos:8 tripleo_container_image_latest: test-latest tripleo_container_cli: podman - - role: "tripleo-container-tag" + - role: "tripleo_container_tag" tripleo_container_image: centos:8 tripleo_container_image_latest: test-latest-2 tripleo_container_cli: podman diff --git a/tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml b/tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml index 161621d3a..7c7915ba9 100644 --- a/tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-container-tag" will search for and load any operating system variable file +# "tripleo_container_tag" will search for and load any operating system variable file - name: Fail if container image is undefined fail: diff --git a/tripleo_ansible/roles/tripleo_create_admin/meta/main.yml b/tripleo_ansible/roles/tripleo_create_admin/meta/main.yml index 61d02baec..47fb51441 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-create-admin + description: TripleO OpenStack Role -- tripleo_create_admin company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml index 2f2acb9b3..dc0a27600 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml @@ -18,10 +18,10 @@ - name: Converge hosts: all roles: - - role: "tripleo-create-admin" + - role: "tripleo_create_admin" post_tasks: - import_role: - name: tripleo-create-admin + name: tripleo_create_admin tasks_from: authorize_user.yml vars: tripleo_admin_user: tripleo-admin diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml index 2fb837e0e..18ec8ae13 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-create-admin" + - role: "tripleo_create_admin" diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml index 05e5823a6..c728ad22a 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml @@ -18,5 +18,5 @@ - name: Converge hosts: all roles: - - role: "tripleo-create-admin" + - role: "tripleo_create_admin" tripleo_admin_generate_key: true diff --git a/tripleo_ansible/roles/tripleo_firewall/meta/main.yml b/tripleo_ansible/roles/tripleo_firewall/meta/main.yml index 33f936c2a..e0d30870c 100644 --- a/tripleo_ansible/roles/tripleo_firewall/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_firewall/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-firewall + description: TripleO OpenStack Role -- tripleo_firewall company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml index 8a789deba..89e944cc8 100644 --- a/tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-firewall" + - role: "tripleo_firewall" 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 index ac9580444..6c9469642 100644 --- a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/playbook.yml +++ b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-firewall" + - role: "tripleo_firewall" tripleo_firewall_rules: '003 accept ftp from all': proto: 'tcp' diff --git a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml index 0705ed0c4..ddb440fb8 100644 --- a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml +++ b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-firewall" + - role: "tripleo_firewall" tripleo_firewall_rules: '003 accept ftp from all': proto: 'tcp' 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 index 4352f48e2..ea6af0951 100644 --- a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/playbook.yml +++ b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-firewall" + - role: "tripleo_firewall" tripleo_firewall_rules: '003 accept ftp from all': proto: 'tcp' diff --git a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml index 0497860c4..82da74c5a 100644 --- a/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml +++ b/tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-firewall" + - role: "tripleo_firewall" tripleo_firewall_rules: '003 accept ftp from all': proto: 'tcp' diff --git a/tripleo_ansible/roles/tripleo_firewall/tasks/main.yml b/tripleo_ansible/roles/tripleo_firewall/tasks/main.yml index d7f6c7270..ed41ab2a0 100644 --- a/tripleo_ansible/roles/tripleo_firewall/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_firewall/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-firewall" will search for and load any operating system variable file +# "tripleo_firewall" will search for and load any operating system variable file - name: Gather variables for each operating system include_vars: "{{ item }}" with_first_found: diff --git a/tripleo_ansible/roles/tripleo_hieradata/meta/main.yml b/tripleo_ansible/roles/tripleo_hieradata/meta/main.yml index 5c2b95930..f01113607 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-hieradata + description: TripleO OpenStack Role -- tripleo_hieradata company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml index 9ba06f6ef..99a180977 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: tripleo-hieradata + - role: tripleo_hieradata diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml index 148148d70..5685c3fd0 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml @@ -32,7 +32,7 @@ tasks: - name: Create hieradata from templates include_role: - name: tripleo-hieradata + name: tripleo_hieradata tasks_from: hieradata_vars.yaml vars: hieradata_templates_list: diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml index f437d0602..c5408477e 100644 --- a/tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-hosts-entries + description: TripleO OpenStack Role -- tripleo_hosts_entries company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml index 509295dea..0ca51ce98 100644 --- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-hosts-entries" + - role: "tripleo_hosts_entries" diff --git a/tripleo_ansible/roles/tripleo_image_serve/meta/main.yml b/tripleo_ansible/roles/tripleo_image_serve/meta/main.yml index 198f0e1ad..1edc9d32f 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-image-serve + description: TripleO OpenStack Role -- tripleo_image_serve company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml index d000cdad9..48985e418 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-image-serve" + - role: "tripleo_image_serve" 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 index 49e9332e1..234abc8e4 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-image-serve" + - role: "tripleo_image_serve" container_registry_host: 'localhost' container_registry_port: 8787 image_data_dir: "/var/lib/image-serve-legacy" diff --git a/tripleo_ansible/roles/tripleo_kernel/meta/main.yml b/tripleo_ansible/roles/tripleo_kernel/meta/main.yml index 0532df8b9..32883ee08 100644 --- a/tripleo_ansible/roles/tripleo_kernel/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_kernel/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-kernel + description: TripleO OpenStack Role -- tripleo_kernel company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml index ab52db833..607d5a176 100644 --- a/tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-kernel" + - role: "tripleo_kernel" diff --git a/tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml index a14f8e10a..d2c753570 100644 --- a/tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml +++ b/tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-kernel" + - role: "tripleo_kernel" tripleo_kernel_extra_modules: dummy: {} tripleo_kernel_extra_packages: diff --git a/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml index 8474d8a9d..dbb19782b 100644 --- a/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml +++ b/tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml @@ -20,7 +20,7 @@ become: true tasks: - include_role: - name: "tripleo-kernel" + name: "tripleo_kernel" tasks_from: kernelargs.yml vars: tripleo_kernel_args: "test=1" diff --git a/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml b/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml index ee053240f..db0c7bed6 100644 --- a/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml +++ b/tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml @@ -44,14 +44,14 @@ # Apply DPDK workarounds before reboot - name: Apply DPDK workarounds include_role: - name: tripleo-ovs-dpdk + name: tripleo_ovs_dpdk tasks_from: workarounds.yml when: reboot_required is defined and reboot_required # Kernel modules loading - name: Load type1 IOMMU driver for VFIO on boot import_role: - name: tripleo-module-load + name: tripleo_module_load vars: modules: - name: vfio_iommu_type1 diff --git a/tripleo_ansible/roles/tripleo_kernel/tasks/main.yml b/tripleo_ansible/roles/tripleo_kernel/tasks/main.yml index ebdd08497..c0af68dd4 100644 --- a/tripleo_ansible/roles/tripleo_kernel/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_kernel/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-kernel" will search for and load any operating system variable file +# "tripleo_kernel" will search for and load any operating system variable file - name: Kernel tuning block become: true diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml b/tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml index 5053270da..11bd6581f 100644 --- a/tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-keystone-resources + description: TripleO OpenStack Role -- tripleo_keystone_resources company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml index e0fdfed70..392046d1a 100644 --- a/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml @@ -24,7 +24,7 @@ state: directory - name: Configure /etc/openstack/clouds.yaml include_role: - name: tripleo-keystone-resources + name: tripleo_keystone_resources tasks_from: clouds vars: tripleo_keystone_resources_cloud_name: openstack @@ -40,7 +40,7 @@ region_name: RegionOne - name: Create keystone admin resources include_role: - name: tripleo-keystone-resources + name: tripleo_keystone_resources tasks_from: admin vars: tripleo_keystone_resources_cloud_name: openstack diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml index dc5b4b3f4..cee982d56 100644 --- a/tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml +++ b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml @@ -34,7 +34,7 @@ - name: "Configure {{ tripleo_keystone_resources_clouds_file_path }}" include_role: - name: tripleo-config + name: tripleo_config vars: tripleo_config_dest: "{{ tripleo_keystone_resources_clouds_file_path }}" tripleo_config_group: "{{ tripleo_keystone_resources_clouds_file_group }}" diff --git a/tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml index 58feb2f75..b0e4c6967 100644 --- a/tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-keystone-resources" will search for and load any operating system variable file +# "tripleo_keystone_resources" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_module_load/meta/main.yml b/tripleo_ansible/roles/tripleo_module_load/meta/main.yml index e65e965c9..d20eec9f6 100644 --- a/tripleo_ansible/roles/tripleo_module_load/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_module_load/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-module-load + description: TripleO OpenStack Role -- tripleo_module_load company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml index 9babd1b68..e46390b64 100644 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all roles: - - role: "tripleo-module-load" + - role: "tripleo_module_load" tripleo_modules: - name: dummy 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 index f8a2ccee3..389a3c593 100644 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/playbook.yml +++ b/tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/playbook.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all roles: - - role: "tripleo-module-load" + - role: "tripleo_module_load" modules: - name: dummy 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 index 5d0087d10..fbf53e71a 100644 --- a/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/playbook.yml +++ b/tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/playbook.yml @@ -18,10 +18,10 @@ - name: Converge hosts: all roles: - - role: "tripleo-module-load" + - role: "tripleo_module_load" tripleo_modules: - name: dummy - - role: "tripleo-module-load" + - role: "tripleo_module_load" tripleo_modules: - name: dummy state: absent diff --git a/tripleo_ansible/roles/tripleo_module_load/tasks/main.yml b/tripleo_ansible/roles/tripleo_module_load/tasks/main.yml index 980c80497..ce4ca1a40 100644 --- a/tripleo_ansible/roles/tripleo_module_load/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_module_load/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-module-load" will search for and load any operating system variable file +# "tripleo_module_load" will search for and load any operating system variable file - name: Kernel module block become: true diff --git a/tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml index 0289d0548..32a492e5c 100644 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-nova-image-cache + description: TripleO OpenStack Role -- tripleo_nova_image_cache company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 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 index 8b78478a8..473321dcd 100644 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-nova-image-cache" + - role: "tripleo_nova_image_cache" diff --git a/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml index 3da9f7daf..be506842d 100644 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_nova_image_cache/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-nova-image-cache" will search for and load any operating system variable file +# "tripleo_nova_image_cache" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml index 0a4118003..d2e75fe84 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ovs-dpdk + description: TripleO OpenStack Role -- tripleo_ovs_dpdk company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml index 84911e34b..17032c0be 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/playbook.yml @@ -19,7 +19,7 @@ hosts: all tasks: - include_role: - name: "tripleo-ovs-dpdk" + name: "tripleo_ovs_dpdk" tasks_from: "config.yml" vars: tripleo_ovs_dpdk_pmd_core_list: "1,13-15" @@ -33,7 +33,7 @@ hosts: all tasks: - include_role: - name: "tripleo-ovs-dpdk" + name: "tripleo_ovs_dpdk" tasks_from: "config.yml" vars: tripleo_ovs_dpdk_pmd_core_list: "1,13-15" diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml index 0c70649c4..044768336 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/playbook.yml @@ -19,7 +19,7 @@ hosts: all tasks: - include_role: - name: "tripleo-ovs-dpdk" + name: "tripleo_ovs_dpdk" tasks_from: "config.yml" vars: tripleo_ovs_dpdk_pmd_core_list: "2,3,26,27,64,65,128,127" diff --git a/tripleo_ansible/roles/tripleo_packages/meta/main.yml b/tripleo_ansible/roles/tripleo_packages/meta/main.yml index 92fd1488d..bdfa2ea49 100644 --- a/tripleo_ansible/roles/tripleo_packages/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_packages/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-packages + description: TripleO OpenStack Role -- tripleo_packages company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml index 1ec7e0bf8..1b4c03aca 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-packages" + - role: "tripleo_packages" diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml index 024ecc6a8..7d5d97919 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/playbook.yml @@ -22,5 +22,5 @@ tasks: - name: Import TripleO packages role include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: external_upgrade.yml diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml index fab9dcbff..75575dd94 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/playbook.yml @@ -22,10 +22,10 @@ tasks: - name: Import TripleO packages role include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: fast_forward_upgrade.yml - name: Import TripleO packages role include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: fast_forward_post_upgrade.yml diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml index cd30ad2e4..3837727eb 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/playbook.yml @@ -22,5 +22,5 @@ tasks: - name: Import TripleO packages role include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: update.yml diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml index d11e11a4b..d95c0102f 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/playbook.yml @@ -20,28 +20,28 @@ tasks: - name: Import TripleO packages role (step|0) include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: upgrade.yml vars: step: 0 - name: Import TripleO packages role (step|2) include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: upgrade.yml vars: step: 2 - name: Import TripleO packages role (step|3) include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: upgrade.yml vars: step: 3 - name: Import TripleO packages role (step|4) include_role: - name: tripleo-packages + name: tripleo_packages tasks_from: upgrade.yml vars: step: 4 diff --git a/tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml b/tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml index 3bcdb491f..1d4f31a93 100644 --- a/tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml +++ b/tripleo_ansible/roles/tripleo_packages/tasks/external_upgrade.yml @@ -24,10 +24,10 @@ block: - name: cleanup tripleo_persist include_role: - name: tripleo-persist + name: tripleo_persist tasks_from: cleanup.yml - name: cleanup tripleo_transfer include_role: - name: tripleo-transfer + name: tripleo_transfer tasks_from: cleanup.yml diff --git a/tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml index 3c7ce531d..ebbc72911 100644 --- a/tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_persist/molecule/default/playbook.yml @@ -32,15 +32,15 @@ tasks: - name: Run persist import_role: - name: tripleo-persist + name: tripleo_persist tasks_from: persist.yml - name: Run restore import_role: - name: tripleo-persist + name: tripleo_persist tasks_from: restore.yml - name: Run cleanup import_role: - name: tripleo-persist + name: tripleo_persist tasks_from: cleanup.yml diff --git a/tripleo_ansible/roles/tripleo_podman/meta/main.yml b/tripleo_ansible/roles/tripleo_podman/meta/main.yml index aff719085..d431536d0 100644 --- a/tripleo_ansible/roles/tripleo_podman/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_podman/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-podman + description: TripleO OpenStack Role -- tripleo_podman company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml index 69b6ae503..4fda07a80 100644 --- a/tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_podman/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-podman" + - role: "tripleo_podman" diff --git a/tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml index 55a932218..d69881f21 100644 --- a/tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml +++ b/tripleo_ansible/roles/tripleo_podman/molecule/install/playbook.yml @@ -20,6 +20,6 @@ tasks: - name: Run install include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_install.yml vars_from: "redhat.yml" diff --git a/tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml b/tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml index 7191fe04d..fbb02be2b 100644 --- a/tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml +++ b/tripleo_ansible/roles/tripleo_podman/molecule/login/playbook.yml @@ -24,5 +24,5 @@ testuser: testpassword tasks: - include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_login.yml diff --git a/tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml b/tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml index 18f43f84f..f335cf126 100644 --- a/tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml +++ b/tripleo_ansible/roles/tripleo_podman/molecule/login/prepare.yml @@ -57,6 +57,6 @@ - name: Run install include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_install.yml vars_from: "redhat.yml" diff --git a/tripleo_ansible/roles/tripleo_podman/tasks/main.yml b/tripleo_ansible/roles/tripleo_podman/tasks/main.yml index a5e5c1ae1..c0437e6ca 100644 --- a/tripleo_ansible/roles/tripleo_podman/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_podman/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-podman" will search for and load any operating system variable file +# "tripleo_podman" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_ptp/meta/main.yml b/tripleo_ansible/roles/tripleo_ptp/meta/main.yml index a5937b80d..58a1d70e7 100644 --- a/tripleo_ansible/roles/tripleo_ptp/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ptp/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-ptp + description: TripleO OpenStack Role -- tripleo_ptp company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 @@ -42,4 +42,4 @@ galaxy_info: # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. dependencies: - - role: tripleo-timezone + - role: tripleo_timezone diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml index 7708044be..e042362a1 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-ptp" + - role: "tripleo_ptp" diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml index 118b0b59e..65d79f761 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/playbook.yml @@ -20,5 +20,5 @@ tasks: - name: Run ntp stop include_role: - name: tripleo-ptp + name: tripleo_ptp tasks_from: tripleo_ntp_stop.yml diff --git a/tripleo_ansible/roles/tripleo_ptp/tasks/main.yml b/tripleo_ansible/roles/tripleo_ptp/tasks/main.yml index 402cf9891..09900ec2e 100644 --- a/tripleo_ansible/roles/tripleo_ptp/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_ptp/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-ptp" will search for and load any operating system variable file +# "tripleo_ptp" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml index 59b5fb944..ac790198b 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-puppet-cache + description: TripleO OpenStack Role -- tripleo_puppet_cache company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml index 849cd8d02..74ff2d452 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-puppet-cache" + - role: "tripleo_puppet_cache" diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml b/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml index 2caf0971c..4e6c3f507 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-puppet-cache" will search for and load any operating system variable file +# "tripleo_puppet_cache" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_securetty/meta/main.yml b/tripleo_ansible/roles/tripleo_securetty/meta/main.yml index f062c698b..9917cc872 100644 --- a/tripleo_ansible/roles/tripleo_securetty/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_securetty/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-securetty + description: TripleO OpenStack Role -- tripleo_securetty company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml index 6eb4bfdc8..20b7eeffe 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/create/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-securetty" + - role: "tripleo_securetty" diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml index 633208a8e..c6072956a 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/default/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-securetty" + - role: "tripleo_securetty" tripleo_ttys: - console - vc/1 diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml index e65e965c9..d20eec9f6 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-module-load + description: TripleO OpenStack Role -- tripleo_module_load company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 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 index 602efb953..10bfe721f 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/playbook.yml @@ -19,4 +19,4 @@ hosts: all pre_tasks: roles: - - role: "tripleo-ssh-known-hosts" + - role: "tripleo_ssh_known_hosts" diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml index fb757fd4c..e42fdb749 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/playbook.yml @@ -18,6 +18,6 @@ - name: Converge hosts: all roles: - - name: tripleo-sshd + - name: tripleo_sshd tripleo_sshd_motd_enabled: true tripleo_sshd_banner_enabled: true diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml index 08ef7f83d..94071a733 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - name: tripleo-sshd + - name: tripleo_sshd diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml index 884423f0b..1e10606b1 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-systemd-wrapper + description: TripleO OpenStack Role -- tripleo_systemd_wrapper company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml index bdccf5cb4..df058723a 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - "tripleo-systemd-wrapper" + - "tripleo_systemd_wrapper" vars: tripleo_systemd_wrapper_cmd: "/usr/sbin/dnsmasq -k" tripleo_systemd_wrapper_config_bind_mount: "/var/lib/config-data/puppet-generated/neutron/etc/neutron:/etc/neutron:ro" diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml index d335b6f09..a97c576bc 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-systemd-wrapper" will search for and load any operating system variable file +# "tripleo_systemd_wrapper" will search for and load any operating system variable file # found within the "vars/" path. If no OS files are found the task will skip. - name: Gather variables for each operating system diff --git a/tripleo_ansible/roles/tripleo_timezone/meta/main.yml b/tripleo_ansible/roles/tripleo_timezone/meta/main.yml index 8f09752c7..f58d3e6cf 100644 --- a/tripleo_ansible/roles/tripleo_timezone/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_timezone/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-timezone + description: TripleO OpenStack Role -- tripleo_timezone company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml index 11dc3748e..2cb438735 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-timezone" + - role: "tripleo_timezone" diff --git a/tripleo_ansible/roles/tripleo_timezone/tasks/main.yml b/tripleo_ansible/roles/tripleo_timezone/tasks/main.yml index c493f5214..c1daa5e54 100644 --- a/tripleo_ansible/roles/tripleo_timezone/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_timezone/tasks/main.yml @@ -15,7 +15,7 @@ # under the License. -# "tripleo-timezone" will search for and load any operating system variable file +# "tripleo_timezone" will search for and load any operating system variable file - name: Set timezone timezone: diff --git a/tripleo_ansible/roles/tripleo_transfer/meta/main.yml b/tripleo_ansible/roles/tripleo_transfer/meta/main.yml index e6163fc05..fb571ea37 100644 --- a/tripleo_ansible/roles/tripleo_transfer/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_transfer/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-transfer + description: TripleO OpenStack Role -- tripleo_transfer company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml index 1cc95cfcf..00e8cff07 100644 --- a/tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_transfer/molecule/default/playbook.yml @@ -18,7 +18,7 @@ - name: Converge hosts: all roles: - - role: "tripleo-transfer" + - role: "tripleo_transfer" tripleo_transfer_src_host: overcloud-controller-0 tripleo_transfer_src_dir: /etc tripleo_transfer_dest_host: overcloud-controller-1 diff --git a/tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml index 9cc08e587..10f8efbf2 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-upgrade-hiera + description: TripleO OpenStack Role -- tripleo_upgrade_hiera company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml index 2f4c027e5..8dd610d51 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/playbook.yml @@ -18,21 +18,21 @@ - name: Converge hosts: all roles: - - role: tripleo-upgrade-hiera + - role: tripleo_upgrade_hiera post_tasks: - - name: test tripleo-upgrade-hiera - add a first value + - name: test tripleo_upgrade_hiera - add a first value include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: pacemaker_short_node_names_override tripleo_upgrade_value: - "controller-0" - - name: test tripleo-upgrade-hiera - add another value + - name: test tripleo_upgrade_hiera - add another value include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: mysql_short_node_names_override @@ -40,23 +40,23 @@ - "controller-0" - "controller-1" - - name: test tripleo-upgrade-hiera - update a value + - name: test tripleo_upgrade_hiera - update a value include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: mysql_short_node_names_override tripleo_upgrade_value: - "controller-1" - - name: test tripleo-upgrade-hiera - remove a value + - name: test tripleo_upgrade_hiera - remove a value include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: pacemaker_short_node_names_override - - name: test tripleo-upgrade-hiera - remove all values + - name: test tripleo_upgrade_hiera - remove all values include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove-all.yml diff --git a/tripleo_ansible/roles/tripleo_validations_package/meta/main.yml b/tripleo_ansible/roles/tripleo_validations_package/meta/main.yml index c1e884b06..927b10a3d 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/meta/main.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: author: OpenStack - description: TripleO OpenStack Role -- tripleo-validations-package + description: TripleO OpenStack Role -- tripleo_validations_package company: Red Hat license: Apache-2.0 min_ansible_version: 2.7 diff --git a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml index af9030547..0a3419e31 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "tripleo-validations-package" + - role: "tripleo_validations_package"