Browse Source

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 <kecarter@redhat.com>
changes/41/703441/7
Kevin Carter 2 years ago committed by Sagi Shnaidman
parent
commit
4c2d54e95c
  1. 4
      tripleo_ansible/playbooks/ceph.yaml
  2. 10
      tripleo_ansible/playbooks/create-nova-cell-v2.yaml
  3. 4
      tripleo_ansible/playbooks/docker-vfs-setup.yml
  4. 8
      tripleo_ansible/playbooks/octavia-files.yaml
  5. 2
      tripleo_ansible/playbooks/tripleo_nova_image_cache.yml
  6. 2
      tripleo_ansible/roles/backup_and_restore/backup/tasks/main.yml
  7. 2
      tripleo_ansible/roles/backup_and_restore/meta/main.yml
  8. 2
      tripleo_ansible/roles/backup_and_restore/molecule/default/playbook.yml
  9. 2
      tripleo_ansible/roles/backup_and_restore/setup_nfs/tasks/main.yml
  10. 2
      tripleo_ansible/roles/backup_and_restore/setup_rear/tasks/main.yml
  11. 2
      tripleo_ansible/roles/backup_and_restore/tasks/main.yml
  12. 2
      tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml
  13. 2
      tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml
  14. 2
      tripleo_ansible/roles/backup_and_restore/templates/exports.j2
  15. 2
      tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2
  16. 2
      tripleo_ansible/roles/backup_and_restore/templates/rescue.conf.j2
  17. 2
      tripleo_ansible/roles/login_defs/meta/main.yml
  18. 2
      tripleo_ansible/roles/login_defs/molecule/default/playbook.yml
  19. 2
      tripleo_ansible/roles/login_defs/tasks/main.yml
  20. 2
      tripleo_ansible/roles/octavia_controller_config/meta/main.yml
  21. 2
      tripleo_ansible/roles/octavia_overcloud_config/meta/main.yml
  22. 2
      tripleo_ansible/roles/octavia_undercloud/meta/main.yml
  23. 2
      tripleo_ansible/roles/tripleo_bootstrap/meta/main.yml
  24. 2
      tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml
  25. 2
      tripleo_ansible/roles/tripleo_bootstrap/tasks/main.yml
  26. 2
      tripleo_ansible/roles/tripleo_cellv2/meta/main.yml
  27. 2
      tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml
  28. 2
      tripleo_ansible/roles/tripleo_ceph_common/molecule/default/playbook.yml
  29. 6
      tripleo_ansible/roles/tripleo_ceph_fetch_dir/meta/main.yml
  30. 2
      tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/playbook.yml
  31. 10
      tripleo_ansible/roles/tripleo_ceph_run_ansible/meta/main.yml
  32. 2
      tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/playbook.yml
  33. 6
      tripleo_ansible/roles/tripleo_ceph_uuid/meta/main.yml
  34. 2
      tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/playbook.yml
  35. 4
      tripleo_ansible/roles/tripleo_ceph_work_dir/meta/main.yml
  36. 2
      tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/playbook.yml
  37. 2
      tripleo_ansible/roles/tripleo_clients_install/meta/main.yml
  38. 2
      tripleo_ansible/roles/tripleo_clients_install/molecule/default/playbook.yml
  39. 2
      tripleo_ansible/roles/tripleo_clients_install/tasks/install_pkgs.yml
  40. 2
      tripleo_ansible/roles/tripleo_config/defaults/main.yml
  41. 2
      tripleo_ansible/roles/tripleo_config/meta/main.yml
  42. 4
      tripleo_ansible/roles/tripleo_config/molecule/default/playbook.yml
  43. 2
      tripleo_ansible/roles/tripleo_container_image_prepare/meta/main.yml
  44. 2
      tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/playbook.yml
  45. 4
      tripleo_ansible/roles/tripleo_container_image_prepare/tasks/main.yml
  46. 2
      tripleo_ansible/roles/tripleo_container_manage/meta/main.yml
  47. 2
      tripleo_ansible/roles/tripleo_container_manage/molecule/default/playbook.yml
  48. 6
      tripleo_ansible/roles/tripleo_container_manage/tasks/main.yml
  49. 2
      tripleo_ansible/roles/tripleo_container_rm/meta/main.yml
  50. 2
      tripleo_ansible/roles/tripleo_container_rm/molecule/default/playbook.yml
  51. 6
      tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/playbook.yml
  52. 2
      tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/playbook.yml
  53. 2
      tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/playbook.yml
  54. 2
      tripleo_ansible/roles/tripleo_container_rm/molecule/podman/playbook.yml
  55. 2
      tripleo_ansible/roles/tripleo_container_stop/meta/main.yml
  56. 2
      tripleo_ansible/roles/tripleo_container_stop/molecule/default/playbook.yml
  57. 2
      tripleo_ansible/roles/tripleo_container_stop/molecule/podman/playbook.yml
  58. 2
      tripleo_ansible/roles/tripleo_container_stop/tasks/main.yml
  59. 2
      tripleo_ansible/roles/tripleo_container_tag/defaults/main.yml
  60. 2
      tripleo_ansible/roles/tripleo_container_tag/meta/main.yml
  61. 4
      tripleo_ansible/roles/tripleo_container_tag/molecule/default/playbook.yml
  62. 4
      tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/playbook.yml
  63. 4
      tripleo_ansible/roles/tripleo_container_tag/molecule/podman/playbook.yml
  64. 2
      tripleo_ansible/roles/tripleo_container_tag/tasks/main.yml
  65. 2
      tripleo_ansible/roles/tripleo_create_admin/meta/main.yml
  66. 4
      tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/playbook.yml
  67. 2
      tripleo_ansible/roles/tripleo_create_admin/molecule/default/playbook.yml
  68. 2
      tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/playbook.yml
  69. 2
      tripleo_ansible/roles/tripleo_firewall/meta/main.yml
  70. 2
      tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml
  71. 2
      tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/playbook.yml
  72. 2
      tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/playbook.yml
  73. 2
      tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/playbook.yml
  74. 2
      tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/playbook.yml
  75. 2
      tripleo_ansible/roles/tripleo_firewall/tasks/main.yml
  76. 2
      tripleo_ansible/roles/tripleo_hieradata/meta/main.yml
  77. 2
      tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml
  78. 2
      tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/playbook.yml
  79. 2
      tripleo_ansible/roles/tripleo_hosts_entries/meta/main.yml
  80. 2
      tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/playbook.yml
  81. 2
      tripleo_ansible/roles/tripleo_image_serve/meta/main.yml
  82. 2
      tripleo_ansible/roles/tripleo_image_serve/molecule/default/playbook.yml
  83. 2
      tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/playbook.yml
  84. 2
      tripleo_ansible/roles/tripleo_kernel/meta/main.yml
  85. 2
      tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml
  86. 2
      tripleo_ansible/roles/tripleo_kernel/molecule/extra/playbook.yml
  87. 2
      tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/playbook.yml
  88. 4
      tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml
  89. 2
      tripleo_ansible/roles/tripleo_kernel/tasks/main.yml
  90. 2
      tripleo_ansible/roles/tripleo_keystone_resources/meta/main.yml
  91. 4
      tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/playbook.yml
  92. 2
      tripleo_ansible/roles/tripleo_keystone_resources/tasks/clouds.yml
  93. 2
      tripleo_ansible/roles/tripleo_keystone_resources/tasks/main.yml
  94. 2
      tripleo_ansible/roles/tripleo_module_load/meta/main.yml
  95. 2
      tripleo_ansible/roles/tripleo_module_load/molecule/default/playbook.yml
  96. 2
      tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/playbook.yml
  97. 4
      tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/playbook.yml
  98. 2
      tripleo_ansible/roles/tripleo_module_load/tasks/main.yml
  99. 2
      tripleo_ansible/roles/tripleo_nova_image_cache/meta/main.yml
  100. 2
      tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/playbook.yml
  101. Some files were not shown because too many files have changed in this diff Show More

4
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

10
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

4
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

8
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

2
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:
#

2
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

2
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

2
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"

2
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

2
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

2
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

2
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

2
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

2
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:

2
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:

2
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:

2
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

2
tripleo_ansible/roles/login_defs/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: "login-defs"
- role: "login_defs"

2
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:

2
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

2
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

2
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

2
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

2
tripleo_ansible/roles/tripleo_bootstrap/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: "tripleo-bootstrap"
- role: "tripleo_bootstrap"

2
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

2
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

2
tripleo_ansible/roles/tripleo_cellv2/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: "tripleo-cellv2"
- role: "tripleo_cellv2"

2
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"

6
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

2
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"

10
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)

2
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"

6
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

2
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"

4
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

2
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"

2
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

2
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"

2
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

2
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

2
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

4
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:

2
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

2
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"

4
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 }}

2
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

2
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

6
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 }}"

2
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

2
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

6
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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.

2
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

2
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

4
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

4
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

4
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

2
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:

2
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

4
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

2
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"

2
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

2
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

2
tripleo_ansible/roles/tripleo_firewall/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: "tripleo-firewall"
- role: "tripleo_firewall"

2
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'

2
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'

2
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'

2
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'

2
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:

2
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

2
tripleo_ansible/roles/tripleo_hieradata/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: tripleo-hieradata
- role: tripleo_hieradata

2
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:

2
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

2
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"

2
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

2
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"

2
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"

2
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

2
tripleo_ansible/roles/tripleo_kernel/molecule/default/playbook.yml

@ -18,4 +18,4 @@
- name: Converge
hosts: all
roles:
- role: "tripleo-kernel"
- role: "tripleo_kernel"

2
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: