openstack/tripleo-heat-templates
Code Issues Proposed changes

Update all roles to use the new role name

Browse Source 
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 <kecarter@redhat.com>
This commit is contained in:
Kevin Carter 2020-01-20 10:31:22 -06:00
parent 2ea64a50bd
commit 9a2a36437d
No known key found for this signature in database
GPG Key ID: CE94BD890A47B20A
64 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/deploy-steps-tasks.yaml
View File

@ -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

6
common/deploy-steps.j2
View File

@ -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 {{ ' }}"' }}

2
common/services/role.role.j2.yaml
View File

@ -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]}

2
deployment/aodh/aodh-api-container-puppet.yaml
View File

@ -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

2
deployment/aodh/aodh-evaluator-container-puppet.yaml
View File

@ -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

2
deployment/aodh/aodh-listener-container-puppet.yaml
View File

@ -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

2
deployment/aodh/aodh-notifier-container-puppet.yaml
View File

@ -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

2
deployment/backup-and-restore/rear-baremetal-ansible.yaml
View File

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

2
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
View File

@ -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

2
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -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

14
deployment/ceph-ansible/ceph-base.yaml
View File

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

2
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -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

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

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

2
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -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

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

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

2
deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
View File

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

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

@ -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]}}"

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

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

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

@ -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

2
deployment/glance/glance-api-container-puppet.yaml
View File

@ -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

2
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -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

2
deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
View File

@ -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

2
deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
View File

@ -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

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

@ -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

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

@ -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

2
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -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

2
deployment/heat/heat-api-container-puppet.yaml
View File

@ -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

2
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -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

2
deployment/horizon/horizon-container-puppet.yaml
View File

@ -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

2
deployment/image-serve/image-serve-baremetal-ansible.yaml
View File

@ -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

2
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -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

2
deployment/keepalived/keepalived-container-puppet.yaml
View File

@ -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

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

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

2
deployment/kernel/kernel-boot-params-baremetal-ansible.yaml
View File

@ -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]}

8
deployment/keystone/keystone-container-puppet.yaml
View File

@ -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

2
deployment/login-defs/login-defs-baremetal.yaml
View File

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

2
deployment/logrotate/logrotate-crond-container-puppet.yaml
View File

@ -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

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

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

2
deployment/memcached/memcached-container-puppet.yaml
View File

@ -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

2
deployment/mistral/mistral-executor-container-puppet.yaml
View File

@ -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

2
deployment/multipathd/multipathd-container.yaml
View File

@ -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

2
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -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

2
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

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

2
deployment/neutron/neutron-l3-container-puppet.yaml
View File

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

2
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -338,7 +338,7 @@ outputs:
- block:
- name: load openvswitch module
import_role:
name: tripleo-module-load
name: tripleo_module_load
vars:
modules:
- name: openvswitch

2
deployment/nova/nova-api-container-puppet.yaml
View File

@ -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

2
deployment/nova/nova-conductor-container-puppet.yaml
View File

@ -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

2
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -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

2
deployment/nova/nova-scheduler-container-puppet.yaml
View File

@ -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

2
deployment/nova/nova-vnc-proxy-container-puppet.yaml
View File

@ -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

2
deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml
View File

@ -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]}

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

@ -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

2
deployment/ovn/ovn-metadata-container-puppet.yaml
View File

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

2
deployment/pacemaker/clustercheck-container-puppet.yaml
View File

@ -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

6
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

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

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

@ -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

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

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

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

@ -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

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

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

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

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

4
deployment/time/ptp-baremetal-ansible.yaml
View File

@ -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

2
deployment/time/timezone-baremetal-ansible.yaml
View File

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

4
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -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

2
deployment/validations/tripleo-validations-baremetal-ansible.yaml
View File

@ -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: []