From 9a2a36437dbb33063fedd790036861e9ac00861d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 20 Jan 2020 10:31:22 -0600 Subject: [PATCH] Update all roles to use the new role name Ansible has decided that roles with hypens in them are no longer supported by not including support for them in collections. This change renames all the roles we use to the new role name. Depends-On: Ie899714aca49781ccd240bb259901d76f177d2ae Change-Id: I4d41b2678a0f340792dd5c601342541ade771c26 Signed-off-by: Kevin Carter --- common/deploy-steps-tasks.yaml | 4 ++-- common/deploy-steps.j2 | 6 +++--- common/services/role.role.j2.yaml | 2 +- deployment/aodh/aodh-api-container-puppet.yaml | 2 +- .../aodh/aodh-evaluator-container-puppet.yaml | 2 +- .../aodh/aodh-listener-container-puppet.yaml | 2 +- .../aodh/aodh-notifier-container-puppet.yaml | 2 +- .../rear-baremetal-ansible.yaml | 2 +- ...lometer-agent-central-container-puppet.yaml | 2 +- ...er-agent-notification-container-puppet.yaml | 2 +- deployment/ceph-ansible/ceph-base.yaml | 14 +++++++------- .../cinder/cinder-api-container-puppet.yaml | 2 +- .../cinder/cinder-backup-pacemaker-puppet.yaml | 6 +++--- .../cinder-scheduler-container-puppet.yaml | 2 +- .../cinder/cinder-volume-pacemaker-puppet.yaml | 6 +++--- ...ner-image-prepare-baremetal-ansible.j2.yaml | 2 +- .../database/mysql-pacemaker-puppet.yaml | 18 +++++++++--------- .../database/redis-container-puppet.yaml | 2 +- .../database/redis-pacemaker-puppet.yaml | 10 +++++----- .../glance/glance-api-container-puppet.yaml | 2 +- .../gnocchi/gnocchi-api-container-puppet.yaml | 2 +- .../gnocchi-metricd-container-puppet.yaml | 2 +- .../gnocchi-statsd-container-puppet.yaml | 2 +- .../haproxy/haproxy-container-puppet.yaml | 2 +- .../haproxy/haproxy-pacemaker-puppet.yaml | 10 +++++----- .../heat/heat-api-cfn-container-puppet.yaml | 2 +- deployment/heat/heat-api-container-puppet.yaml | 2 +- .../heat/heat-engine-container-puppet.yaml | 2 +- .../horizon/horizon-container-puppet.yaml | 2 +- .../image-serve-baremetal-ansible.yaml | 2 +- .../ironic-conductor-container-puppet.yaml | 2 +- .../keepalived-container-puppet.yaml | 2 +- .../kernel/kernel-baremetal-ansible.yaml | 2 +- .../kernel-boot-params-baremetal-ansible.yaml | 2 +- .../keystone/keystone-container-puppet.yaml | 8 ++++---- .../login-defs/login-defs-baremetal.yaml | 2 +- .../logrotate-crond-container-puppet.yaml | 2 +- .../manila/manila-share-pacemaker-puppet.yaml | 6 +++--- .../memcached/memcached-container-puppet.yaml | 2 +- .../mistral-executor-container-puppet.yaml | 2 +- .../multipathd/multipathd-container.yaml | 2 +- .../neutron/neutron-api-container-puppet.yaml | 2 +- .../neutron/neutron-dhcp-container-puppet.yaml | 2 +- .../neutron/neutron-l3-container-puppet.yaml | 2 +- .../neutron-ovs-agent-container-puppet.yaml | 2 +- deployment/nova/nova-api-container-puppet.yaml | 2 +- .../nova/nova-conductor-container-puppet.yaml | 2 +- .../nova/nova-metadata-container-puppet.yaml | 2 +- .../nova/nova-scheduler-container-puppet.yaml | 2 +- .../nova/nova-vnc-proxy-container-puppet.yaml | 2 +- .../openvswitch-dpdk-baremetal-ansible.yaml | 2 +- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 10 +++++----- .../ovn/ovn-metadata-container-puppet.yaml | 2 +- .../clustercheck-container-puppet.yaml | 2 +- .../pacemaker/pacemaker-baremetal-puppet.yaml | 6 +++--- .../podman/podman-baremetal-ansible.yaml | 16 ++++++++-------- ...itmq-messaging-notify-pacemaker-puppet.yaml | 12 ++++++------ .../rabbitmq-messaging-pacemaker-puppet.yaml | 10 +++++----- ...abbitmq-messaging-rpc-pacemaker-puppet.yaml | 12 ++++++------ .../securetty/securetty-baremetal-ansible.yaml | 2 +- deployment/time/ptp-baremetal-ansible.yaml | 4 ++-- .../time/timezone-baremetal-ansible.yaml | 2 +- .../tripleo-packages-baremetal-puppet.yaml | 4 ++-- .../tripleo-validations-baremetal-ansible.yaml | 2 +- 64 files changed, 127 insertions(+), 127 deletions(-) diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml index 9f7a239339..4762dcf2c4 100644 --- a/common/deploy-steps-tasks.yaml +++ b/common/deploy-steps-tasks.yaml @@ -69,7 +69,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=1738529 - name: Pre-cache facts for container-puppet.py include_role: - name: tripleo-puppet-cache + name: tripleo_puppet_cache tags: - container_config - container_config_tasks @@ -201,7 +201,7 @@ block: - name: "Manage containers for step {{ step }} with tripleo-ansible" include_role: - name: tripleo-container-manage + name: tripleo_container_manage vars: tripleo_container_manage_concurrency: 2 tripleo_container_manage_systemd_order: true diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index c3f0ed9de0..6b398d8388 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -542,7 +542,7 @@ outputs: block: - name: Hiera config include_role: - name: tripleo-hieradata + name: tripleo_hieradata - name: Hiera symlink file: src: /etc/puppet/hiera.yaml @@ -561,7 +561,7 @@ outputs: - name: Hieradata from vars when: not ansible_check_mode|bool include_role: - name: tripleo-hieradata + name: tripleo_hieradata tasks_from: hieradata_vars.yaml vars: hieradata_templates_list: @@ -695,7 +695,7 @@ outputs: - name: Configure Hosts Entries include_role: - name: tripleo-hosts-entries + name: tripleo_hosts_entries vars: tripleo_hosts_entries_undercloud_hosts_entries: {{ '"{{ ' }} undercloud_hosts_entries {{ ' }}"' }} tripleo_hosts_entries_extra_hosts_entries: {{ '"{{ ' }} extra_hosts_entries {{ ' }}"' }} diff --git a/common/services/role.role.j2.yaml b/common/services/role.role.j2.yaml index 0942f594f5..683e645a18 100644 --- a/common/services/role.role.j2.yaml +++ b/common/services/role.role.j2.yaml @@ -406,7 +406,7 @@ outputs: list_concat: - - name: Run firewall role include_role: - name: tripleo-firewall + name: tripleo_firewall vars: tripleo_firewall_rules: {get_attr: [FirewallRules, value]} - {get_attr: [HostPrepTasks, value]} diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index baf8ba86ff..2617e8a786 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -254,7 +254,7 @@ outputs: block: - name: Stop aodh api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - aodh_api diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index eed91b3921..f529760e97 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -125,7 +125,7 @@ outputs: block: - name: Stop aodh evaluator container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - aodh_evaluator diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 49e20e6fd3..2f3a07d25c 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -125,7 +125,7 @@ outputs: block: - name: Stop aodh listener container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - aodh_listener diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index f2e17ceb42..131055e48d 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -126,7 +126,7 @@ outputs: block: - name: Stop aodh notifier container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - aodh_notifier diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml index e6023f085a..334786ed73 100644 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ b/deployment/backup-and-restore/rear-baremetal-ansible.yaml @@ -86,7 +86,7 @@ outputs: service_name: rear host_prep_tasks: - include_role: - name: backup-and-restore + name: backup_and_restore tasks_from: setup_rear ansible_group_vars: tripleo_backup_and_restore_nfs_server: {get_param: BackupAndRestoreNFSServer} diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 51fcd78db4..22262014ae 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -183,7 +183,7 @@ outputs: block: - name: Stop ceilometer agent central container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - ceilometer_agent_central diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index f7024c4824..0ebcf2a6fc 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -140,7 +140,7 @@ outputs: block: - name: Stop ceilometer agent notification container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - ceilometer_agent_notification diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index 06ad44d680..64a6ddb25b 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -572,11 +572,11 @@ outputs: data: {get_param: NodeDataLookup} - name: create ceph-ansible working direcotry include_role: - name: tripleo-ceph-work-dir + name: tripleo_ceph_work_dir tasks_from: prepare - name: prepare for ceph-ansible uuid gathering include_role: - name: tripleo-ceph-uuid + name: tripleo_ceph_uuid tasks_from: prepare - name: ceph_base_external_deploy_task when: step|int == 2 @@ -596,22 +596,22 @@ outputs: ceph_ansible_skip_tags: {get_param: CephAnsibleSkipTags} - name: get ssh private key include_role: - name: tripleo-ceph-work-dir + name: tripleo_ceph_work_dir tasks_from: get_ssh_private_key - name: run nodes-uuid include_role: - name: tripleo-ceph-uuid + name: tripleo_ceph_uuid tasks_from: gather - name: create copy of ceph-ansible fetch directory include_role: - name: tripleo-ceph-fetch-dir + name: tripleo_ceph_fetch_dir tasks_from: create - name: run ceph-ansible include_role: - name: tripleo-ceph-run-ansible + name: tripleo_ceph_run_ansible - name: backup and clean fetch directory include_role: - name: tripleo-ceph-fetch-dir + name: tripleo_ceph_fetch_dir tasks_from: backup_and_clean - name: ensure ceph health is OK before proceeding import_role: diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 19b411a594..548debe7a0 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -388,7 +388,7 @@ outputs: block: - name: Stop cinder api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - cinder_api diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 4e88f91864..8c459d9cc6 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -231,7 +231,7 @@ outputs: - name: Cinder Backup tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerCinderBackupImage} container_image_latest: *cinder_backup_image_pcmklatest @@ -254,7 +254,7 @@ outputs: register: new_cinder_backup_image_id - name: Retag pcmklatest to latest cinder_backup image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{cinder_backup_image}}" container_image_latest: "{{cinder_backup_image_latest}}" @@ -289,7 +289,7 @@ outputs: cinder_backup_image_current: "{{cinder_backup_image_current_res.stdout}}" - name: Temporarily tag the current cinder_backup image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{cinder_backup_current_pcmklatest_id.stdout}}" container_image_latest: "{{cinder_backup_docker_image_latest}}" diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index b7398d49c6..1d0d038638 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -151,7 +151,7 @@ outputs: block: - name: Stop cinder scheduler container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - cinder_scheduler diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index dbaecd0597..3fb2bb09b5 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -216,7 +216,7 @@ outputs: - name: Cinder Volume tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerCinderVolumeImage} container_image_latest: *cinder_volume_image_pcmklatest @@ -240,7 +240,7 @@ outputs: register: new_cinder_volume_image_id - name: Retag pcmklatest to latest cinder_volume image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{cinder_volume_image}}" container_image_latest: "{{cinder_volume_image_latest}}" @@ -275,7 +275,7 @@ outputs: cinder_volume_image_current: "{{cinder_volume_image_current_res.stdout}}" - name: Temporarily tag the current cinder_volume image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{cinder_volume_image_current}}" container_image_latest: "{{cinder_volume_image_latest}}" diff --git a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml index e22833ccc8..1dd36c3229 100644 --- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml +++ b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml @@ -109,7 +109,7 @@ outputs: external_deploy_tasks: - name: Run tripleo-container-image-prepare role import_role: - name: tripleo-container-image-prepare + name: tripleo_container_image_prepare vars: tripleo_container_image_prepare_log_file: {get_param: ContainerImagePrepareLogFile} tripleo_container_image_prepare_debug: diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index f0c3a7b9a9..7c655e285a 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -322,7 +322,7 @@ outputs: - name: MySQL tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerMysqlImage} container_image_latest: *mysql_image_pcmklatest @@ -346,7 +346,7 @@ outputs: register: new_galera_image_id - name: Retag pcmklatest to latest galera image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{galera_image}}" container_image_latest: "{{galera_image_latest}}" @@ -379,7 +379,7 @@ outputs: block: - name: Persist mysql data include_role: - name: tripleo-persist + name: tripleo_persist tasks_from: persist.yml vars: tripleo_persist_dir: /var/lib/mysql @@ -395,7 +395,7 @@ outputs: block: - name: Restore mysql data include_role: - name: tripleo-persist + name: tripleo_persist tasks_from: restore.yml vars: tripleo_persist_dir: /var/lib/mysql @@ -414,7 +414,7 @@ outputs: galera_image_current: "{{galera_image_current_res.stdout}}" - name: Temporarily tag the current galera image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{galera_image_current}}" container_image_latest: "{{galera_image_latest}}" @@ -517,21 +517,21 @@ outputs: when: mysql_short_node_names_upgraded | length > 1 - name: add the mysql short name to hiera data for the upgrade. 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: "{{mysql_short_node_names_upgraded}}" - name: add the mysql long name to hiera data for the upgrade include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: mysql_node_names_override tripleo_upgrade_value: "{{mysql_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: "{{item}}" @@ -611,7 +611,7 @@ outputs: block: - name: Transfer mysql data include_role: - name: tripleo-transfer + name: tripleo_transfer vars: tripleo_transfer_src_dir: /var/lib/mysql tripleo_transfer_src_host: "{{hostvars[groups['overcloud'][0]]['mysql_short_node_names'][1]}}" diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 771a0b9858..e5103b6c2c 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -248,7 +248,7 @@ outputs: block: - name: Stop redis container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: with_items: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 177c5574dd..6d9ee3d613 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -301,7 +301,7 @@ outputs: - name: Redis tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerRedisImage} container_image_latest: *redis_image_pcmklatest @@ -324,7 +324,7 @@ outputs: register: new_redis_image_id - name: Retag pcmklatest to latest redis image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{redis_image}}" container_image_latest: "{{redis_image_latest}}" @@ -359,7 +359,7 @@ outputs: redis_image_current: "{{redis_image_current_res.stdout}}" - name: Temporarily tag the current redis image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{redis_image_current}}" container_image_latest: "{{redis_image_latest}}" @@ -448,14 +448,14 @@ outputs: when: redis_short_node_names_upgraded | length > 1 - name: add the redis short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: redis_short_node_names_override tripleo_upgrade_value: "{{redis_short_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: redis_short_node_names_override diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index aa21b5888a..613e5e7979 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -627,7 +627,7 @@ outputs: block: - name: Stop glance api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - glance_api diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index b6380308f4..1503bb9ceb 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -373,7 +373,7 @@ outputs: block: - name: Stop gnocchi container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - gnocchi_api diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index f0098ae868..45651c1530 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -180,7 +180,7 @@ outputs: block: - name: Stop gnocchi metricd container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - gnocchi_metricd diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index d114b20346..95ded93929 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -172,7 +172,7 @@ outputs: block: - name: Stop gnocchi statsd container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - gnocchi_statsd diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 879866d57d..ed5f422f94 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -351,7 +351,7 @@ outputs: block: - name: Stop haproxy container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - haproxy diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index eb8d1b59c2..fd26d81a5d 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -339,7 +339,7 @@ outputs: - name: HAproxy tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerHAProxyImage} container_image_latest: *haproxy_image_pcmklatest @@ -425,7 +425,7 @@ outputs: register: new_haproxy_image_id - name: Retag pcmklatest to latest haproxy image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{haproxy_image}}" container_image_latest: "{{haproxy_image_latest}}" @@ -460,7 +460,7 @@ outputs: haproxy_image_current: "{{haproxy_image_current_res.stdout}}" - name: Temporarily tag the current haproxy image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{haproxy_image_current}}" container_image_latest: "{{haproxy_image_latest}}" @@ -568,14 +568,14 @@ outputs: when: haproxy_short_node_names_upgraded | length > 1 - name: add the haproxy short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: haproxy_short_node_names_override tripleo_upgrade_value: "{{haproxy_short_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: haproxy_short_node_names_override diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 088e34ceab..1f69de281d 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -226,7 +226,7 @@ outputs: block: - name: Stop heat cfn container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - heat_api_cfn diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 4eb4cfaed9..529e13bfc5 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -286,7 +286,7 @@ outputs: block: - name: Stop heat api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - heat_api diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index e7c0830dc6..ef9eb0d1fe 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -300,7 +300,7 @@ outputs: block: - name: Stop heat engine container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - heat_engine diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index f028bc84bb..89816cdc7c 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -334,7 +334,7 @@ outputs: block: - name: Stop horizon container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - horizon diff --git a/deployment/image-serve/image-serve-baremetal-ansible.yaml b/deployment/image-serve/image-serve-baremetal-ansible.yaml index f202f8b58c..91487a5eca 100644 --- a/deployment/image-serve/image-serve-baremetal-ansible.yaml +++ b/deployment/image-serve/image-serve-baremetal-ansible.yaml @@ -67,7 +67,7 @@ outputs: - {get_param: LocalContainerRegistry} container_registry_port: {get_param: [EndpointMap, DockerRegistryInternal, port]} - include_role: - name: tripleo-image-serve + name: tripleo_image_serve upgrade_tasks: - name: Uninstall docker-distribution when: step|int == 3 diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 662b3f840c..aabdcd1de2 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -544,7 +544,7 @@ outputs: host_prep_tasks: - name: load iscsi_tcp module import_role: - name: tripleo-module-load + name: tripleo_module_load vars: modules: - name: iscsi_tcp diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 24da4e9491..d191423cc7 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/deployment/keepalived/keepalived-container-puppet.yaml @@ -139,7 +139,7 @@ outputs: ignore_errors: True - name: load ip_vs module import_role: - name: tripleo-module-load + name: tripleo_module_load vars: modules: - name: ip_vs diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 4b94e34206..4a654f735f 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-baremetal-ansible.yaml @@ -147,7 +147,7 @@ outputs: service_name: kernel host_prep_tasks: - include_role: - name: tripleo-kernel + name: tripleo_kernel ansible_group_vars: hieradata_localhost_address: if: diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml index 22b83e06ed..2d390008d7 100644 --- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml @@ -93,7 +93,7 @@ outputs: - name: Configure kernel args and reboot when: step|int == 0 include_role: - name: tripleo-kernel + name: tripleo_kernel tasks_from: kernelargs.yml vars: tripleo_kernel_args: {get_attr: [RoleParametersValue, value, kernel_args]} diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 14d4c609a5..c5b288d322 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -699,7 +699,7 @@ outputs: 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: {get_param: RootStackName} @@ -721,7 +721,7 @@ outputs: block: - name: Manage Keystone resources for OpenStack services include_role: - name: tripleo-keystone-resources + name: tripleo_keystone_resources vars: tripleo_keystone_resources_catalog_config: "{{ keystone_resources }}" tripleo_keystone_resources_service_project: 'service' @@ -742,7 +742,7 @@ outputs: - name: Manage Keystone domains from LDAP config when: keystone_ldap_domain_enabled|bool include_role: - name: tripleo-keystone-resources + name: tripleo_keystone_resources tasks_from: domains vars: tripleo_keystone_resources_catalog_config: "{{ keystone_resources }}" @@ -783,7 +783,7 @@ outputs: block: - name: Stop keystone container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - keystone diff --git a/deployment/login-defs/login-defs-baremetal.yaml b/deployment/login-defs/login-defs-baremetal.yaml index 0bab0ba799..d91580a0fb 100644 --- a/deployment/login-defs/login-defs-baremetal.yaml +++ b/deployment/login-defs/login-defs-baremetal.yaml @@ -58,7 +58,7 @@ outputs: service_name: login_defs host_prep_tasks: - include_role: - name: login-defs + name: login_defs ansible_group_vars: tripleo_login_defs_password_max_days: {get_param: PasswordMaxDays} tripleo_login_defs_password_min_days: {get_param: PasswordMinDays} diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 176ded200f..9268670e69 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml @@ -165,7 +165,7 @@ outputs: block: - name: Stop logrotate container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - logrotate_crond diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index aa545d9027..91a5bb0de0 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -211,7 +211,7 @@ outputs: - name: Manila Share tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerManilaShareImage} container_image_latest: *manila_share_image_pcmklatest @@ -234,7 +234,7 @@ outputs: register: new_manila_share_image_id - name: Retag pcmklatest to latest manila_share image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{manila_share_image}}" container_image_latest: "{{manila_share_image_latest}}" @@ -269,7 +269,7 @@ outputs: manila_share_image_current: "{{manila_share_image_current_res.stdout}}" - name: Temporarily tag the current manila_share image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{manila_share_image_current}}" container_image_latest: "{{manila_share_image_latest}}" diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 1e04cf999a..16482533e3 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -181,7 +181,7 @@ outputs: block: - name: Stop memcached container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - memcached diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index d9f1e62e58..4bc2c262d2 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/mistral/mistral-executor-container-puppet.yaml @@ -209,7 +209,7 @@ outputs: tripleo_admin_user: {get_param: TripleoAdminUser} undercloud_cfg_file: {get_param: UndercloudConfigFilePath} - import_role: - name: tripleo-create-admin + name: tripleo_create_admin tasks_from: create_user.yml vars: tripleo_admin_generate_key: true diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index 6e0354613c..02515ce49c 100644 --- a/deployment/multipathd/multipathd-container.yaml +++ b/deployment/multipathd/multipathd-container.yaml @@ -146,7 +146,7 @@ outputs: when: multipathd_enabled|bool - name: load dm-multipath import_role: - name: tripleo-module-load + name: tripleo_module_load vars: modules: - name: dm-multipath diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index e801522863..20ce402152 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -540,7 +540,7 @@ outputs: block: - name: Stop neutron api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - neutron_api diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 84dd394ca2..06dc27c60d 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -318,7 +318,7 @@ outputs: - {get_param: NeutronWrapperDebug} - name: Create dhcp systemd wrappers include_role: - name: tripleo-systemd-wrapper + name: tripleo_systemd_wrapper vars: tripleo_systemd_wrapper_cmd: "{{ dhcp_wrapper_item.cmd }}" tripleo_systemd_wrapper_config_bind_mount: "/var/lib/config-data/puppet-generated/neutron:/etc/neutron:ro" diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 227d0bec19..d3fb176ec3 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-puppet.yaml @@ -271,7 +271,7 @@ outputs: - {get_param: NeutronWrapperDebug} - name: Create l3 systemd wrappers include_role: - name: tripleo-systemd-wrapper + name: tripleo_systemd_wrapper vars: tripleo_systemd_wrapper_cmd: "{{ l3_wrapper_item.cmd }}" tripleo_systemd_wrapper_config_bind_mount: "/var/lib/config-data/puppet-generated/neutron:/etc/neutron:ro" diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index b27ea2f8b2..5beb6c0ac8 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -338,7 +338,7 @@ outputs: - block: - name: load openvswitch module import_role: - name: tripleo-module-load + name: tripleo_module_load vars: modules: - name: openvswitch diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index ac7ecd8952..b165749660 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -505,7 +505,7 @@ outputs: block: - name: Stop nova api container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - nova_api diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index d546bbc7bc..ea1c872569 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -229,7 +229,7 @@ outputs: block: - name: Stop nova conductor container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - nova_conductor diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 2b4e8e1a7d..0ae551f102 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -273,7 +273,7 @@ outputs: block: - name: Stop nova metadata container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - nova_metadata diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 77590c215a..6b7e3db7b7 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -245,7 +245,7 @@ outputs: block: - name: Stop nova scheduler container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - nova_scheduler diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index cdbb708580..b56fa5264d 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -334,7 +334,7 @@ outputs: block: - name: Stop nova vnc proxy container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - nova_vnc_proxy diff --git a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml index 8d157bcef9..ac7bfc26de 100644 --- a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml @@ -155,7 +155,7 @@ outputs: - - name: Run ovs-dpdk role when: step|int == 0 include_role: - name: tripleo-ovs-dpdk + name: tripleo_ovs_dpdk vars: tripleo_ovs_dpdk_pmd_core_list: {get_attr: [RoleParametersDpdk, value, pmd]} tripleo_ovs_dpdk_lcore_list: {get_attr: [RoleParametersDpdk, value, lcore]} diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 63b950e8b0..b08e7072f4 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -258,7 +258,7 @@ outputs: - name: OVN DBS tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerOvnDbsImage} container_image_latest: *ovn_dbs_image_pcmklatest @@ -302,7 +302,7 @@ outputs: register: new_ovn_dbs_image_id - name: Retag pcmklatest to latest ovn_dbs image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{ovn_dbs_image}}" container_image_latest: "{{ovn_dbs_image_latest}}" @@ -365,7 +365,7 @@ outputs: ovn_dbs_image_current: "{{ovn_dbs_image_current_res.stdout}}" - name: Temporarily tag the current ovn_dbs image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{ovn_dbs_image_current}}" container_image_latest: "{{ovn_dbs_image_latest}}" @@ -451,14 +451,14 @@ outputs: when: ovn_dbs_short_node_names_upgraded | length > 1 - name: add the ovn_dbs short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: ovn_dbs_short_node_names_override tripleo_upgrade_value: "{{ovn_dbs_short_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: ovn_dbs_short_node_names_override diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index f182e4f388..2da5d5259b 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -258,7 +258,7 @@ outputs: - {get_param: NeutronWrapperDebug} - name: Create ovn metadata systemd wrappers include_role: - name: tripleo-systemd-wrapper + name: tripleo_systemd_wrapper vars: tripleo_systemd_wrapper_cmd: "{{ ovn_wrapper_item.cmd }}" tripleo_systemd_wrapper_config_bind_mount: "/var/lib/config-data/puppet-generated/neutron:/etc/neutron:ro" diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index e68d8b04d2..853bf5ad53 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-puppet.yaml @@ -114,7 +114,7 @@ outputs: block: - name: Stop clustercheck container import_role: - name: tripleo-container-stop + name: tripleo_container_stop vars: tripleo_containers_to_stop: - clustercheck diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 72e0c169fe..fbec0a6721 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -252,21 +252,21 @@ outputs: - name: add the pacemaker short name to hiera data for the upgrade. 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: "{{pacemaker_short_node_names_upgraded}}" - name: add the pacemaker ips to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: pacemaker_node_ips_override tripleo_upgrade_value: "{{pacemaker_node_ips_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: "{{item}}" diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 0c8438148a..c3f109d981 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -104,7 +104,7 @@ outputs: - name: Run podman install include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_install.yml vars_from: "redhat.yml" vars: @@ -112,7 +112,7 @@ outputs: - name: Run podman login include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_login.yml vars: tripleo_container_registry_logins: "{{ container_registry_logins }}" @@ -156,7 +156,7 @@ outputs: when: pcs_stat.stat.exists - name: Stop all services by stopping all docker containers include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_docker_stop.yml tags: - never @@ -167,7 +167,7 @@ outputs: when: - (step | int) == 1 include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_install.yml vars_from: "redhat.yml" @@ -176,12 +176,12 @@ outputs: when: - (step | int) == 3 include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_docker_purge.yml - name: Stop docker include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_docker_stop.yml - name: Purge Podman @@ -189,7 +189,7 @@ outputs: - (step | int) == 3 - container_cli == 'podman' include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_purge.yml post_update_tasks: @@ -198,5 +198,5 @@ outputs: - (step | int) == 3 - container_cli == 'podman' include_role: - name: tripleo-podman + name: tripleo_podman tasks_from: tripleo_podman_purge.yml diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 32bc2d8994..aba7c7d9dd 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -258,7 +258,7 @@ outputs: - name: RabbitMQ tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerRabbitmqImage} container_image_latest: *rabbitmq_image_pcmklatest @@ -282,7 +282,7 @@ outputs: register: new_rabbitmq_image_id - name: Retag pcmklatest to latest rabbitmq image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -319,7 +319,7 @@ outputs: block: - name: Temporarily tag the current rabbitmq image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image_current}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -412,21 +412,21 @@ outputs: when: oslo_messaging_notify_short_node_names_upgraded | length > 1 - name: add the oslo_messaging_notify short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: oslo_messaging_notify_short_node_names_override tripleo_upgrade_value: "{{oslo_messaging_notify_short_node_names_upgraded}}" - name: add the oslo_messaging_notify long name to hiera data for the upgrade include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: oslo_messaging_notify_node_names_override tripleo_upgrade_value: "{{oslo_messaging_notify_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: "{{item}}" diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 822c0eefda..f6ea751700 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -258,7 +258,7 @@ outputs: - name: RabbitMQ tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerRabbitmqImage} container_image_latest: *rabbitmq_image_pcmklatest @@ -282,7 +282,7 @@ outputs: register: new_rabbitmq_image_id - name: Retag pcmklatest to latest rabbitmq image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -319,7 +319,7 @@ outputs: block: - name: Temporarily tag the current rabbitmq image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image_current}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -409,14 +409,14 @@ outputs: when: rabbitmq_short_node_names_upgraded | length > 1 - name: add the rabbitmq short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: rabbitmq_short_node_names_override tripleo_upgrade_value: "{{rabbitmq_short_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: rabbitmq_short_node_names_override diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 083b8e0974..59ab9c1075 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -264,7 +264,7 @@ outputs: - name: RabbitMQ tag container image for pacemaker when: step|int == 1 import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: {get_param: ContainerRabbitmqImage} container_image_latest: *rabbitmq_image_pcmklatest @@ -288,7 +288,7 @@ outputs: register: new_rabbitmq_image_id - name: Retag pcmklatest to latest rabbitmq image include_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -325,7 +325,7 @@ outputs: block: - name: Temporarily tag the current rabbitmq image id with the upgraded image name import_role: - name: tripleo-container-tag + name: tripleo_container_tag vars: container_image: "{{rabbitmq_image_current}}" container_image_latest: "{{rabbitmq_image_latest}}" @@ -418,21 +418,21 @@ outputs: when: oslo_messaging_rpc_short_node_names_upgraded | length > 1 - name: add the oslo_messaging_rpc short name to hiera data for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: oslo_messaging_rpc_short_node_names_override tripleo_upgrade_value: "{{oslo_messaging_rpc_short_node_names_upgraded}}" - name: add the oslo_messaging_rpc long name to hiera data for the upgrade include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: set.yml vars: tripleo_upgrade_key: oslo_messaging_rpc_node_names_override tripleo_upgrade_value: "{{oslo_messaging_rpc_node_names_upgraded}}" - name: remove the extra hiera data needed for the upgrade. include_role: - name: tripleo-upgrade-hiera + name: tripleo_upgrade_hiera tasks_from: remove.yml vars: tripleo_upgrade_key: "{{item}}" diff --git a/deployment/securetty/securetty-baremetal-ansible.yaml b/deployment/securetty/securetty-baremetal-ansible.yaml index 88d3295056..2fbe5f821e 100644 --- a/deployment/securetty/securetty-baremetal-ansible.yaml +++ b/deployment/securetty/securetty-baremetal-ansible.yaml @@ -45,6 +45,6 @@ outputs: host_prep_tasks: - name: Run securetty role include_role: - name: tripleo-securetty + name: tripleo_securetty vars: tripleo_ttys: {get_param: TtyValues} diff --git a/deployment/time/ptp-baremetal-ansible.yaml b/deployment/time/ptp-baremetal-ansible.yaml index 97a9da4f9a..441ac3752c 100644 --- a/deployment/time/ptp-baremetal-ansible.yaml +++ b/deployment/time/ptp-baremetal-ansible.yaml @@ -88,7 +88,7 @@ outputs: - name: Run ptp role include_role: - name: tripleo-ptp + name: tripleo_ptp vars: tripleo_timezone: {get_param: TimeZone} tripleo_ptp_slave_mode: {get_attr: [RoleParametersValue, value, tripleo_ptp4l_conf_slaveOnly]} @@ -108,7 +108,7 @@ outputs: - name: Run ntp stop include_role: - name: tripleo-ptp + name: tripleo_ptp tasks_from: tripleo_ntp_stop.yml when: - (step | int) == 2 diff --git a/deployment/time/timezone-baremetal-ansible.yaml b/deployment/time/timezone-baremetal-ansible.yaml index 8d78310ba3..3080c7c75d 100644 --- a/deployment/time/timezone-baremetal-ansible.yaml +++ b/deployment/time/timezone-baremetal-ansible.yaml @@ -43,6 +43,6 @@ outputs: host_prep_tasks: - name: Run timezone role include_role: - name: tripleo-timezone + name: tripleo_timezone vars: tripleo_timezone: {get_param: TimeZone} diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 3086641862..da0e629772 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -386,11 +386,11 @@ outputs: 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 update_tasks: - name: Check for existing yum.pid diff --git a/deployment/validations/tripleo-validations-baremetal-ansible.yaml b/deployment/validations/tripleo-validations-baremetal-ansible.yaml index 4e8fe6c144..0d7a57f3c8 100644 --- a/deployment/validations/tripleo-validations-baremetal-ansible.yaml +++ b/deployment/validations/tripleo-validations-baremetal-ansible.yaml @@ -40,6 +40,6 @@ outputs: - name: Install tripleo-validations package and create user when: step|int == 0 include_role: - name: tripleo-validations-package + name: tripleo_validations_package config_settings: {} upgrade_tasks: []