Replace all references to the old role name
This change replaces all of the roles references in our various files with the
new role name. This is being done because Ansible no longer allows hyphens in
role names.
TODO: (gchamoul) Remove healthcheck-service-status once this patch is
merged. Tripleo Jobs are RED due to THT trying to execute this
validation as inflight one but it has been renamed healthcheck_service_status.
Co-Authored-by: Gael Chamoulaud <gchamoul@redhat.com>
Change-Id: I19bb587ece403f86ddd0bbe174c282326500cfd3
(cherry picked from commit ceb0f75182)
This commit is contained in:
Cédric Jeanneret
Gael Chamoulaud (Strider)
parent
2be56c51ba
commit
14411dcb6a
|
|
@ -10,4 +10,4 @@
|
||||||
- prep
|
- prep
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
roles:
|
roles:
|
||||||
- advanced-format-512e-support
|
- advanced_format_512e_support
|
||||||
|
|
|
||||||
|
|
@ -17,4 +17,4 @@
|
||||||
event_ttl_check: "event_time_to_live"
|
event_ttl_check: "event_time_to_live"
|
||||||
panko_config_file: "/var/lib/config-data/puppet-generated/panko/etc/panko/panko.conf"
|
panko_config_file: "/var/lib/config-data/puppet-generated/panko/etc/panko/panko.conf"
|
||||||
roles:
|
roles:
|
||||||
- ceilometerdb-size
|
- ceilometerdb_size
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- xfs-check-ftype
|
- xfs_check_ftype
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- check-latest-packages-version
|
- check_latest_packages_version
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
roles:
|
roles:
|
||||||
- check-network-gateway
|
- check_network_gateway
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- collect-flavors-and-verify-profiles
|
- collect_flavors_and_verify_profiles
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
roles:
|
roles:
|
||||||
- container-status
|
- container_status
|
||||||
|
|
|
||||||
|
|
@ -100,4 +100,4 @@
|
||||||
- zaqar
|
- zaqar
|
||||||
- zaqar_websocket
|
- zaqar_websocket
|
||||||
roles:
|
roles:
|
||||||
- containerized-undercloud-docker
|
- containerized_undercloud_docker
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
keystone_conf_file: "/var/lib/config-data/puppet-generated/keystone/etc/keystone/keystone.conf"
|
keystone_conf_file: "/var/lib/config-data/puppet-generated/keystone/etc/keystone/keystone.conf"
|
||||||
roles:
|
roles:
|
||||||
- controller-token
|
- controller_token
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
nofiles_min: 1024
|
nofiles_min: 1024
|
||||||
nproc_min: 2048
|
nproc_min: 2048
|
||||||
roles:
|
roles:
|
||||||
- controller-ulimits
|
- controller_ulimits
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
ctlplane_iprange_min_size: 20
|
ctlplane_iprange_min_size: 20
|
||||||
roles:
|
roles:
|
||||||
- ctlplane-ip-range
|
- ctlplane_ip_range
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
roles:
|
roles:
|
||||||
- default-node-count
|
- default_node_count
|
||||||
|
|
|
||||||
|
|
@ -14,5 +14,5 @@
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: dhcp-validations
|
name: dhcp_validations
|
||||||
tasks_from: dhcp-introspection
|
tasks_from: dhcp-introspection
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,5 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: dhcp-validations
|
name: dhcp_validations
|
||||||
tasks_from: dhcp-provisioning
|
tasks_from: dhcp-provisioning
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
delay_number: 1
|
delay_number: 1
|
||||||
inflight_healthcheck_services: []
|
inflight_healthcheck_services: []
|
||||||
roles:
|
roles:
|
||||||
- healthcheck-service-status
|
- healthcheck_service_status
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
roles:
|
roles:
|
||||||
- image-serve
|
- image_serve
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- ironic-boot-configuration
|
- ironic_boot_configuration
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
min_open_files_limit: 16384
|
min_open_files_limit: 16384
|
||||||
roles:
|
roles:
|
||||||
- mysql-open-files-limit
|
- mysql_open_files_limit
|
||||||
|
|
|
||||||
|
|
@ -18,4 +18,4 @@
|
||||||
plan_env_path: plan-environment.yaml
|
plan_env_path: plan-environment.yaml
|
||||||
ip_pools_path: environments/ips-from-pool-all.yaml
|
ip_pools_path: environments/ips-from-pool-all.yaml
|
||||||
roles:
|
roles:
|
||||||
- network-environment
|
- network_environment
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,4 @@
|
||||||
- /etc/neutron/l3_agent.ini
|
- /etc/neutron/l3_agent.ini
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- neutron-sanity-check
|
- neutron_sanity_check
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
nova_conf_path: "/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf"
|
nova_conf_path: "/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf"
|
||||||
roles:
|
roles:
|
||||||
- no-op-firewall-nova-driver
|
- no_op_firewall_nova_driver
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
groups:
|
groups:
|
||||||
- no-op
|
- no-op
|
||||||
roles:
|
roles:
|
||||||
- no-op
|
- no_op
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
ironic_conf_file: "/var/lib/config-data/puppet-generated/ironic/etc/ironic/ironic.conf"
|
ironic_conf_file: "/var/lib/config-data/puppet-generated/ironic/etc/ironic/ironic.conf"
|
||||||
roles:
|
roles:
|
||||||
- node-disks
|
- node_disks
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- node-health
|
- node_health
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@
|
||||||
notify_nova_on_port_status_check: "notify_nova_on_port_status_changes"
|
notify_nova_on_port_status_check: "notify_nova_on_port_status_changes"
|
||||||
tenant_name_check: "tenant_name"
|
tenant_name_check: "tenant_name"
|
||||||
roles:
|
roles:
|
||||||
- nova-event-callback
|
- nova_event_callback
|
||||||
|
|
|
||||||
|
|
@ -19,4 +19,4 @@
|
||||||
groups:
|
groups:
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- nova-status
|
- nova_status
|
||||||
|
|
|
||||||
|
|
@ -27,5 +27,5 @@
|
||||||
resource_reqs_prod: false
|
resource_reqs_prod: false
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: openshift-on-openstack
|
name: openshift_on_openstack
|
||||||
tasks_from: openshift-hw-requirements.yaml
|
tasks_from: openshift-hw-requirements.yaml
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,5 @@
|
||||||
- openshift-on-openstack
|
- openshift-on-openstack
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: openshift-on-openstack
|
name: openshift_on_openstack
|
||||||
tasks_from: openshift-nw-requirements.yaml
|
tasks_from: openshift-nw-requirements.yaml
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
roles:
|
roles:
|
||||||
- openstack-endpoints
|
- openstack_endpoints
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
groups:
|
groups:
|
||||||
- post-deployment
|
- post-deployment
|
||||||
roles:
|
roles:
|
||||||
- ovs-dpdk-pmd
|
- ovs_dpdk_pmd
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
groups:
|
groups:
|
||||||
- post-deployment
|
- post-deployment
|
||||||
roles:
|
roles:
|
||||||
- pacemaker-status
|
- pacemaker_status
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
min_fd_limit: 16384
|
min_fd_limit: 16384
|
||||||
roles:
|
roles:
|
||||||
- rabbitmq-limits
|
- rabbitmq_limits
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
roles:
|
roles:
|
||||||
- service-status
|
- service_status
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
roles:
|
roles:
|
||||||
- stack-health
|
- stack_health
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
groups:
|
groups:
|
||||||
- post-deployment
|
- post-deployment
|
||||||
roles:
|
roles:
|
||||||
- stonith-exists
|
- stonith_exists
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,4 @@
|
||||||
network_environment_path: environments/network-environment.yaml
|
network_environment_path: environments/network-environment.yaml
|
||||||
ironic_inspector_conf_file: "/var/lib/config-data/puppet-generated/ironic_inspector/etc/ironic-inspector/inspector.conf"
|
ironic_inspector_conf_file: "/var/lib/config-data/puppet-generated/ironic_inspector/etc/ironic-inspector/inspector.conf"
|
||||||
roles:
|
roles:
|
||||||
- switch-vlans
|
- switch_vlans
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@
|
||||||
- post-deployment
|
- post-deployment
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: tls-everywhere
|
name: tls_everywhere
|
||||||
tasks_from: common.yaml
|
tasks_from: common.yaml
|
||||||
- include_role:
|
- include_role:
|
||||||
name: tls-everywhere
|
name: tls_everywhere
|
||||||
tasks_from: overcloud-post-deployment.yaml
|
tasks_from: overcloud-post-deployment.yaml
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: tls-everywhere
|
name: tls_everywhere
|
||||||
tasks_from: common.yaml
|
tasks_from: common.yaml
|
||||||
- include_role:
|
- include_role:
|
||||||
name: tls-everywhere
|
name: tls_everywhere
|
||||||
tasks_from: pre-deployment.yaml
|
tasks_from: pre-deployment.yaml
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,5 @@
|
||||||
- prep
|
- prep
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: tls-everywhere
|
name: tls_everywhere
|
||||||
tasks_from: prep.yaml
|
tasks_from: prep.yaml
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
min_undercloud_cpu_count: 8
|
min_undercloud_cpu_count: 8
|
||||||
roles:
|
roles:
|
||||||
- undercloud-cpu
|
- undercloud_cpu
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
debug_check: "True"
|
debug_check: "True"
|
||||||
roles:
|
roles:
|
||||||
- undercloud-debug
|
- undercloud_debug
|
||||||
|
|
|
||||||
|
|
@ -17,4 +17,4 @@
|
||||||
- {mount: /, min_size: 20}
|
- {mount: /, min_size: 20}
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- undercloud-disk-space
|
- undercloud_disk_space
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,4 @@
|
||||||
- {mount: /, min_size: 25}
|
- {mount: /, min_size: 25}
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- undercloud-disk-space
|
- undercloud_disk_space
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
cron_check: "heat-manage purge_deleted"
|
cron_check: "heat-manage purge_deleted"
|
||||||
roles:
|
roles:
|
||||||
- undercloud-heat-purge-deleted
|
- undercloud_heat_purge_deleted
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@
|
||||||
- /etc/neutron/l3_agent.ini
|
- /etc/neutron/l3_agent.ini
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- neutron-sanity-check
|
- neutron_sanity_check
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
- pre-deployment
|
- pre-deployment
|
||||||
max_process_count: 8
|
max_process_count: 8
|
||||||
roles:
|
roles:
|
||||||
- undercloud-process-count
|
- undercloud_process_count
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,4 @@
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
min_undercloud_ram_gb: 24
|
min_undercloud_ram_gb: 24
|
||||||
roles:
|
roles:
|
||||||
- undercloud-ram
|
- undercloud_ram
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
- prep
|
- prep
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
roles:
|
roles:
|
||||||
- undercloud-selinux-mode
|
- undercloud_selinux_mode
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
- post-upgrade
|
- post-upgrade
|
||||||
- pre-upgrade
|
- pre-upgrade
|
||||||
roles:
|
roles:
|
||||||
- undercloud-service-status
|
- undercloud_service_status
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
- pre-introspection
|
- pre-introspection
|
||||||
cron_check: "keystone-manage token_flush"
|
cron_check: "keystone-manage token_flush"
|
||||||
roles:
|
roles:
|
||||||
- undercloud-tokenflush
|
- undercloud_tokenflush
|
||||||
|
|
|
||||||
|
|
@ -18,4 +18,4 @@
|
||||||
validate_selinux_filter: "None"
|
validate_selinux_filter: "None"
|
||||||
validate_selinux_skip_list: {}
|
validate_selinux_skip_list: {}
|
||||||
roles:
|
roles:
|
||||||
- validate-selinux
|
- validate_selinux
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
tasks:
|
tasks:
|
||||||
- name: Validate No Available Update for patch rpm
|
- name: Validate No Available Update for patch rpm
|
||||||
include_role:
|
include_role:
|
||||||
name: check-latest-packages-version
|
name: check_latest_packages_version
|
||||||
vars:
|
vars:
|
||||||
packages:
|
packages:
|
||||||
- patch
|
- patch
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
- name: Working Detection of Update for Pam package
|
- name: Working Detection of Update for Pam package
|
||||||
block:
|
block:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: check-latest-packages-version
|
name: check_latest_packages_version
|
||||||
vars:
|
vars:
|
||||||
packages:
|
packages:
|
||||||
- pam
|
- pam
|
||||||
|
|
@ -47,5 +47,5 @@
|
||||||
- name: Fail the test
|
- name: Fail the test
|
||||||
fail:
|
fail:
|
||||||
msg: |
|
msg: |
|
||||||
The check-latest-packages-version role should have detected
|
The check_latest_packages_version role should have detected
|
||||||
that packages have available updates.
|
that packages have available updates.
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
tasks:
|
tasks:
|
||||||
- name: successful check with ctlplane-subnet
|
- name: successful check with ctlplane-subnet
|
||||||
include_role:
|
include_role:
|
||||||
name: check-network-gateway
|
name: check_network_gateway
|
||||||
|
|
||||||
- name: override undercloud.conf
|
- name: override undercloud.conf
|
||||||
copy:
|
copy:
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
- name: successful check with local_ip
|
- name: successful check with local_ip
|
||||||
include_role:
|
include_role:
|
||||||
name: check-network-gateway
|
name: check_network_gateway
|
||||||
|
|
||||||
- name: fail the validation
|
- name: fail the validation
|
||||||
block:
|
block:
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
- name: run the validation
|
- name: run the validation
|
||||||
include_role:
|
include_role:
|
||||||
name: check-network-gateway
|
name: check_network_gateway
|
||||||
|
|
||||||
rescue:
|
rescue:
|
||||||
- name: Clear host error
|
- name: Clear host error
|
||||||
|
|
@ -64,5 +64,5 @@
|
||||||
- name: Fail the test
|
- name: Fail the test
|
||||||
fail:
|
fail:
|
||||||
msg: |
|
msg: |
|
||||||
The check-network-gateway validation didn't properly detect faulty
|
The check_network_gateway validation didn't properly detect faulty
|
||||||
gateway!
|
gateway!
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
tasks:
|
tasks:
|
||||||
- name: pass validation
|
- name: pass validation
|
||||||
include_role:
|
include_role:
|
||||||
name: controller-token
|
name: controller_token
|
||||||
|
|
||||||
- name: fail validation
|
- name: fail validation
|
||||||
block:
|
block:
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
admin_token = CHANGEME
|
admin_token = CHANGEME
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: controller-token
|
name: controller_token
|
||||||
vars:
|
vars:
|
||||||
keystone_conf_file: /keystone.conf
|
keystone_conf_file: /keystone.conf
|
||||||
rescue:
|
rescue:
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
tasks:
|
tasks:
|
||||||
- block:
|
- block:
|
||||||
- include_role:
|
- include_role:
|
||||||
name: controller-ulimits
|
name: controller_ulimits
|
||||||
rescue:
|
rescue:
|
||||||
- name: Clear host errors
|
- name: Clear host errors
|
||||||
meta: clear_host_errors
|
meta: clear_host_errors
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
dhcp_start = 192.168.12.10
|
dhcp_start = 192.168.12.10
|
||||||
dhcp_end = 192.168.12.100
|
dhcp_end = 192.168.12.100
|
||||||
- include_role:
|
- include_role:
|
||||||
name: ctlplane-ip-range
|
name: ctlplane_ip_range
|
||||||
|
|
||||||
- name: Test failing
|
- name: Test failing
|
||||||
block:
|
block:
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
dhcp_start = 192.168.12.10
|
dhcp_start = 192.168.12.10
|
||||||
dhcp_end = 192.168.12.20
|
dhcp_end = 192.168.12.20
|
||||||
- include_role:
|
- include_role:
|
||||||
name: ctlplane-ip-range
|
name: ctlplane_ip_range
|
||||||
rescue:
|
rescue:
|
||||||
- name: Clear host errors
|
- name: Clear host errors
|
||||||
meta: clear_host_errors
|
meta: clear_host_errors
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue