openstack/tripleo-heat-templates
Code Issues Proposed changes

Rename roles that we have missed

Browse Source 
These roles were not renamed when we removed all of the hyphens.
This change removes the remaining hyphenated roles.

Change-Id: I3b25bfdef91b0bfc8d624d71a884d57508eaf004
This commit is contained in:
Rajesh Tailor 2020-03-19 12:50:24 +05:30
parent 0d0d6adc19
commit 62fbe15d0b
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -431,7 +431,7 @@ outputs:
params:
$NETWORK: {get_param: ThalesHSMNetworkName}
- include_role:
name: thales-hsm
name: thales_hsm
vars:
map_merge:
- thales_install_client: true
@ -445,7 +445,7 @@ outputs:
when: step|int == 2
block:
- include_role:
name: atos-hsm
name: atos_hsm
vars:
{get_param: ATOSVars}
- null

8
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -358,7 +358,7 @@ outputs:
msg: "Prepare cinder_backup upgrade for {{ cinder_backup_short_node_names_upgraded }}"
- name: remove cinder_backup init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- cinder_backup_init_bundle
@ -366,21 +366,21 @@ outputs:
- cinder_backup_short_node_names_upgraded | length > 1
- name: add the cinder_backup 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: cinder_backup_short_node_names_override
tripleo_upgrade_value: "{{ cinder_backup_short_node_names_upgraded }}"
- name: add the cinder_backup 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: cinder_backup_node_names_override
tripleo_upgrade_value: "{{ cinder_backup_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 }}"

8
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -345,7 +345,7 @@ outputs:
msg: "Prepare cinder_volume upgrade for {{ cinder_volume_short_node_names_upgraded }}"
- name: remove cinder_volume init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- cinder_volume_init_bundle
@ -353,21 +353,21 @@ outputs:
- cinder_volume_short_node_names_upgraded | length > 1
- name: add the cinder_volume 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: cinder_volume_short_node_names_override
tripleo_upgrade_value: "{{ cinder_volume_short_node_names_upgraded }}"
- name: add the cinder_volume 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: cinder_volume_node_names_override
tripleo_upgrade_value: "{{ cinder_volume_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 }}"

2
deployment/clients/openstack-clients-baremetal-ansible.yaml
View File

@ -37,4 +37,4 @@ outputs:
service_name: openstack_clients
host_prep_tasks:
- include_role:
name: tripleo-clients-install
name: tripleo_clients_install

2
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -497,7 +497,7 @@ outputs:
msg: "Prepare galera upgrade for {{ mysql_short_node_names_upgraded }}"
- name: remove mysql init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- mysql_init_bundle

2
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -427,7 +427,7 @@ outputs:
msg: "Prepare redis upgrade for {{ redis_short_node_names_upgraded }}"
- name: remove redis init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- redis_init_bundle

2
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -547,7 +547,7 @@ outputs:
msg: "Prepare haproxy upgrade for {{ haproxy_short_node_names_upgraded }}"
- name: remove haproxy init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- haproxy_init_bundle

4
deployment/ipsec/ipsec-baremetal-ansible.yaml
View File

@ -99,7 +99,7 @@ outputs:
when: step|int == 1
block:
- include_role:
name: tripleo-ipsec
name: tripleo_ipsec
vars:
map_merge:
- ipsec_configure_vips: false
@ -113,7 +113,7 @@ outputs:
when: step|int == 3
block:
- include_role:
name: tripleo-ipsec
name: tripleo_ipsec
vars:
map_merge:
- ipsec_configure_vips: true

8
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -338,7 +338,7 @@ outputs:
msg: "Prepare manila_share upgrade for {{ manila_share_short_node_names_upgraded }}"
- name: remove manila_share init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- manila_share_init_bundle
@ -346,21 +346,21 @@ outputs:
- manila_share_short_node_names_upgraded | length > 1
- name: add the manila_share 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: manila_share_short_node_names_override
tripleo_upgrade_value: "{{ manila_share_short_node_names_upgraded }}"
- name: add the manila_share 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: manila_share_node_names_override
tripleo_upgrade_value: "{{ manila_share_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 }}"

2
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -450,7 +450,7 @@ outputs:
msg: "Prepare ovn_dbs upgrade for {{ ovn_dbs_short_node_names_upgraded }}"
- name: remove ovn_dbs init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- ovn_dbs_init_bundle

2
deployment/podman/podman-baremetal-ansible.yaml
View File

@ -148,7 +148,7 @@ outputs:
- []
- {get_param: DockerInsecureRegistryAddress}
- include_role:
name: tripleo-podman
name: tripleo_podman
tasks_from: tripleo_podman_install.yml
vars_from: "redhat.yml"
vars:

2
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -392,7 +392,7 @@ outputs:
msg: "Prepare oslo_messaging_notify upgrade for {{ oslo_messaging_notify_short_node_names_upgraded }}"
- name: remove rabbitmq init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- rabbitmq_init_bundle

2
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -389,7 +389,7 @@ outputs:
msg: "Prepare rabbitmq upgrade for {{ rabbitmq_short_node_names_upgraded }}"
- name: remove rabbitmq init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- rabbitmq_init_bundle

2
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -398,7 +398,7 @@ outputs:
msg: "Prepare oslo_messaging_rpc upgrade for {{ oslo_messaging_rpc_short_node_names_upgraded }}"
- name: remove rabbitmq init container on upgrade-scaleup to force re-init
include_role:
name: tripleo-container-rm
name: tripleo_container_rm
vars:
tripleo_containers_to_rm:
- rabbitmq_init_bundle