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
|
||||
- pre-deployment
|
||||
roles:
|
||||
- advanced-format-512e-support
|
||||
- advanced_format_512e_support
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@
|
|||
event_ttl_check: "event_time_to_live"
|
||||
panko_config_file: "/var/lib/config-data/puppet-generated/panko/etc/panko/panko.conf"
|
||||
roles:
|
||||
- ceilometerdb-size
|
||||
- ceilometerdb_size
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
groups:
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- xfs-check-ftype
|
||||
- xfs_check_ftype
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
groups:
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- check-latest-packages-version
|
||||
- check_latest_packages_version
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
groups:
|
||||
- pre-introspection
|
||||
roles:
|
||||
- check-network-gateway
|
||||
- check_network_gateway
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- pre-deployment
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- collect-flavors-and-verify-profiles
|
||||
- collect_flavors_and_verify_profiles
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- post-deployment
|
||||
- post-upgrade
|
||||
roles:
|
||||
- container-status
|
||||
- container_status
|
||||
|
|
|
|||
|
|
@ -100,4 +100,4 @@
|
|||
- zaqar
|
||||
- zaqar_websocket
|
||||
roles:
|
||||
- containerized-undercloud-docker
|
||||
- containerized_undercloud_docker
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- post-deployment
|
||||
keystone_conf_file: "/var/lib/config-data/puppet-generated/keystone/etc/keystone/keystone.conf"
|
||||
roles:
|
||||
- controller-token
|
||||
- controller_token
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
nofiles_min: 1024
|
||||
nproc_min: 2048
|
||||
roles:
|
||||
- controller-ulimits
|
||||
- controller_ulimits
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- pre-introspection
|
||||
ctlplane_iprange_min_size: 20
|
||||
roles:
|
||||
- ctlplane-ip-range
|
||||
- ctlplane_ip_range
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
groups:
|
||||
- pre-deployment
|
||||
roles:
|
||||
- default-node-count
|
||||
- default_node_count
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@
|
|||
- pre-introspection
|
||||
tasks:
|
||||
- include_role:
|
||||
name: dhcp-validations
|
||||
name: dhcp_validations
|
||||
tasks_from: dhcp-introspection
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@
|
|||
- pre-deployment
|
||||
tasks:
|
||||
- include_role:
|
||||
name: dhcp-validations
|
||||
name: dhcp_validations
|
||||
tasks_from: dhcp-provisioning
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
delay_number: 1
|
||||
inflight_healthcheck_services: []
|
||||
roles:
|
||||
- healthcheck-service-status
|
||||
- healthcheck_service_status
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- post-deployment
|
||||
- post-upgrade
|
||||
roles:
|
||||
- image-serve
|
||||
- image_serve
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
- pre-deployment
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- ironic-boot-configuration
|
||||
- ironic_boot_configuration
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
- post-deployment
|
||||
min_open_files_limit: 16384
|
||||
roles:
|
||||
- mysql-open-files-limit
|
||||
- mysql_open_files_limit
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@
|
|||
plan_env_path: plan-environment.yaml
|
||||
ip_pools_path: environments/ips-from-pool-all.yaml
|
||||
roles:
|
||||
- network-environment
|
||||
- network_environment
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@
|
|||
- /etc/neutron/l3_agent.ini
|
||||
|
||||
roles:
|
||||
- neutron-sanity-check
|
||||
- neutron_sanity_check
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- post-deployment
|
||||
nova_conf_path: "/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf"
|
||||
roles:
|
||||
- no-op-firewall-nova-driver
|
||||
- no_op_firewall_nova_driver
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
groups:
|
||||
- no-op
|
||||
roles:
|
||||
- no-op
|
||||
- no_op
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
- pre-deployment
|
||||
ironic_conf_file: "/var/lib/config-data/puppet-generated/ironic/etc/ironic/ironic.conf"
|
||||
roles:
|
||||
- node-disks
|
||||
- node_disks
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
groups:
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- node-health
|
||||
- node_health
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@
|
|||
notify_nova_on_port_status_check: "notify_nova_on_port_status_changes"
|
||||
tenant_name_check: "tenant_name"
|
||||
roles:
|
||||
- nova-event-callback
|
||||
- nova_event_callback
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@
|
|||
groups:
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- nova-status
|
||||
- nova_status
|
||||
|
|
|
|||
|
|
@ -27,5 +27,5 @@
|
|||
resource_reqs_prod: false
|
||||
tasks:
|
||||
- include_role:
|
||||
name: openshift-on-openstack
|
||||
name: openshift_on_openstack
|
||||
tasks_from: openshift-hw-requirements.yaml
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
- openshift-on-openstack
|
||||
tasks:
|
||||
- include_role:
|
||||
name: openshift-on-openstack
|
||||
name: openshift_on_openstack
|
||||
tasks_from: openshift-nw-requirements.yaml
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
- pre-upgrade
|
||||
- post-upgrade
|
||||
roles:
|
||||
- openstack-endpoints
|
||||
- openstack_endpoints
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
groups:
|
||||
- post-deployment
|
||||
roles:
|
||||
- ovs-dpdk-pmd
|
||||
- ovs_dpdk_pmd
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
groups:
|
||||
- post-deployment
|
||||
roles:
|
||||
- pacemaker-status
|
||||
- pacemaker_status
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
- post-deployment
|
||||
min_fd_limit: 16384
|
||||
roles:
|
||||
- rabbitmq-limits
|
||||
- rabbitmq_limits
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@
|
|||
- post-deployment
|
||||
- post-upgrade
|
||||
roles:
|
||||
- service-status
|
||||
- service_status
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- pre-upgrade
|
||||
- post-upgrade
|
||||
roles:
|
||||
- stack-health
|
||||
- stack_health
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
groups:
|
||||
- post-deployment
|
||||
roles:
|
||||
- stonith-exists
|
||||
- stonith_exists
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@
|
|||
network_environment_path: environments/network-environment.yaml
|
||||
ironic_inspector_conf_file: "/var/lib/config-data/puppet-generated/ironic_inspector/etc/ironic-inspector/inspector.conf"
|
||||
roles:
|
||||
- switch-vlans
|
||||
- switch_vlans
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
- post-deployment
|
||||
tasks:
|
||||
- include_role:
|
||||
name: tls-everywhere
|
||||
name: tls_everywhere
|
||||
tasks_from: common.yaml
|
||||
- include_role:
|
||||
name: tls-everywhere
|
||||
name: tls_everywhere
|
||||
tasks_from: overcloud-post-deployment.yaml
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
- pre-deployment
|
||||
tasks:
|
||||
- include_role:
|
||||
name: tls-everywhere
|
||||
name: tls_everywhere
|
||||
tasks_from: common.yaml
|
||||
- include_role:
|
||||
name: tls-everywhere
|
||||
name: tls_everywhere
|
||||
tasks_from: pre-deployment.yaml
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
- prep
|
||||
tasks:
|
||||
- include_role:
|
||||
name: tls-everywhere
|
||||
name: tls_everywhere
|
||||
tasks_from: prep.yaml
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@
|
|||
- pre-introspection
|
||||
min_undercloud_cpu_count: 8
|
||||
roles:
|
||||
- undercloud-cpu
|
||||
- undercloud_cpu
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
- pre-deployment
|
||||
debug_check: "True"
|
||||
roles:
|
||||
- undercloud-debug
|
||||
- undercloud_debug
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@
|
|||
- {mount: /, min_size: 20}
|
||||
|
||||
roles:
|
||||
- undercloud-disk-space
|
||||
- undercloud_disk_space
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@
|
|||
- {mount: /, min_size: 25}
|
||||
|
||||
roles:
|
||||
- undercloud-disk-space
|
||||
- undercloud_disk_space
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
- pre-deployment
|
||||
cron_check: "heat-manage purge_deleted"
|
||||
roles:
|
||||
- undercloud-heat-purge-deleted
|
||||
- undercloud_heat_purge_deleted
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@
|
|||
- /etc/neutron/l3_agent.ini
|
||||
|
||||
roles:
|
||||
- neutron-sanity-check
|
||||
- neutron_sanity_check
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
- pre-deployment
|
||||
max_process_count: 8
|
||||
roles:
|
||||
- undercloud-process-count
|
||||
- undercloud_process_count
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@
|
|||
- pre-upgrade
|
||||
min_undercloud_ram_gb: 24
|
||||
roles:
|
||||
- undercloud-ram
|
||||
- undercloud_ram
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
- prep
|
||||
- pre-introspection
|
||||
roles:
|
||||
- undercloud-selinux-mode
|
||||
- undercloud_selinux_mode
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@
|
|||
- post-upgrade
|
||||
- pre-upgrade
|
||||
roles:
|
||||
- undercloud-service-status
|
||||
- undercloud_service_status
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
- pre-introspection
|
||||
cron_check: "keystone-manage token_flush"
|
||||
roles:
|
||||
- undercloud-tokenflush
|
||||
- undercloud_tokenflush
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@
|
|||
validate_selinux_filter: "None"
|
||||
validate_selinux_skip_list: {}
|
||||
roles:
|
||||
- validate-selinux
|
||||
- validate_selinux
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
tasks:
|
||||
- name: Validate No Available Update for patch rpm
|
||||
include_role:
|
||||
name: check-latest-packages-version
|
||||
name: check_latest_packages_version
|
||||
vars:
|
||||
packages:
|
||||
- patch
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
- name: Working Detection of Update for Pam package
|
||||
block:
|
||||
- include_role:
|
||||
name: check-latest-packages-version
|
||||
name: check_latest_packages_version
|
||||
vars:
|
||||
packages:
|
||||
- pam
|
||||
|
|
@ -47,5 +47,5 @@
|
|||
- name: Fail the test
|
||||
fail:
|
||||
msg: |
|
||||
The check-latest-packages-version role should have detected
|
||||
The check_latest_packages_version role should have detected
|
||||
that packages have available updates.
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
tasks:
|
||||
- name: successful check with ctlplane-subnet
|
||||
include_role:
|
||||
name: check-network-gateway
|
||||
name: check_network_gateway
|
||||
|
||||
- name: override undercloud.conf
|
||||
copy:
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
- name: successful check with local_ip
|
||||
include_role:
|
||||
name: check-network-gateway
|
||||
name: check_network_gateway
|
||||
|
||||
- name: fail the validation
|
||||
block:
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
- name: run the validation
|
||||
include_role:
|
||||
name: check-network-gateway
|
||||
name: check_network_gateway
|
||||
|
||||
rescue:
|
||||
- name: Clear host error
|
||||
|
|
@ -64,5 +64,5 @@
|
|||
- name: Fail the test
|
||||
fail:
|
||||
msg: |
|
||||
The check-network-gateway validation didn't properly detect faulty
|
||||
The check_network_gateway validation didn't properly detect faulty
|
||||
gateway!
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
tasks:
|
||||
- name: pass validation
|
||||
include_role:
|
||||
name: controller-token
|
||||
name: controller_token
|
||||
|
||||
- name: fail validation
|
||||
block:
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
admin_token = CHANGEME
|
||||
|
||||
- include_role:
|
||||
name: controller-token
|
||||
name: controller_token
|
||||
vars:
|
||||
keystone_conf_file: /keystone.conf
|
||||
rescue:
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
tasks:
|
||||
- block:
|
||||
- include_role:
|
||||
name: controller-ulimits
|
||||
name: controller_ulimits
|
||||
rescue:
|
||||
- name: Clear host errors
|
||||
meta: clear_host_errors
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
dhcp_start = 192.168.12.10
|
||||
dhcp_end = 192.168.12.100
|
||||
- include_role:
|
||||
name: ctlplane-ip-range
|
||||
name: ctlplane_ip_range
|
||||
|
||||
- name: Test failing
|
||||
block:
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
dhcp_start = 192.168.12.10
|
||||
dhcp_end = 192.168.12.20
|
||||
- include_role:
|
||||
name: ctlplane-ip-range
|
||||
name: ctlplane_ip_range
|
||||
rescue:
|
||||
- name: 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