diff --git a/playbooks/512e.yaml b/playbooks/512e.yaml index 651d967c7..e71094d4e 100644 --- a/playbooks/512e.yaml +++ b/playbooks/512e.yaml @@ -10,4 +10,4 @@ - prep - pre-deployment roles: - - advanced-format-512e-support + - advanced_format_512e_support diff --git a/playbooks/ceilometerdb-size.yaml b/playbooks/ceilometerdb-size.yaml index 130bd1ca1..465bccdf0 100644 --- a/playbooks/ceilometerdb-size.yaml +++ b/playbooks/ceilometerdb-size.yaml @@ -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 diff --git a/playbooks/check-ftype.yaml b/playbooks/check-ftype.yaml index 7c22857be..8a52c2d3f 100644 --- a/playbooks/check-ftype.yaml +++ b/playbooks/check-ftype.yaml @@ -9,4 +9,4 @@ groups: - pre-upgrade roles: - - xfs-check-ftype + - xfs_check_ftype diff --git a/playbooks/check-latest-packages-version.yaml b/playbooks/check-latest-packages-version.yaml index ff3e3ac3a..e14499442 100644 --- a/playbooks/check-latest-packages-version.yaml +++ b/playbooks/check-latest-packages-version.yaml @@ -10,4 +10,4 @@ groups: - pre-upgrade roles: - - check-latest-packages-version + - check_latest_packages_version diff --git a/playbooks/check-network-gateway.yaml b/playbooks/check-network-gateway.yaml index 3419b6649..7029cfffe 100644 --- a/playbooks/check-network-gateway.yaml +++ b/playbooks/check-network-gateway.yaml @@ -9,4 +9,4 @@ groups: - pre-introspection roles: - - check-network-gateway + - check_network_gateway diff --git a/playbooks/collect-flavors-and-verify-profiles.yaml b/playbooks/collect-flavors-and-verify-profiles.yaml index 1f728eab2..ae33218b8 100644 --- a/playbooks/collect-flavors-and-verify-profiles.yaml +++ b/playbooks/collect-flavors-and-verify-profiles.yaml @@ -10,4 +10,4 @@ - pre-deployment - pre-upgrade roles: - - collect-flavors-and-verify-profiles + - collect_flavors_and_verify_profiles diff --git a/playbooks/container-status.yaml b/playbooks/container-status.yaml index d97bdea3c..e4ae98988 100644 --- a/playbooks/container-status.yaml +++ b/playbooks/container-status.yaml @@ -10,4 +10,4 @@ - post-deployment - post-upgrade roles: - - container-status + - container_status diff --git a/playbooks/containerized-undercloud-docker.yaml b/playbooks/containerized-undercloud-docker.yaml index 0d19a56f9..5aad4721f 100644 --- a/playbooks/containerized-undercloud-docker.yaml +++ b/playbooks/containerized-undercloud-docker.yaml @@ -100,4 +100,4 @@ - zaqar - zaqar_websocket roles: - - containerized-undercloud-docker + - containerized_undercloud_docker diff --git a/playbooks/controller-token.yaml b/playbooks/controller-token.yaml index 9e0cc84ee..67cd5c3cc 100644 --- a/playbooks/controller-token.yaml +++ b/playbooks/controller-token.yaml @@ -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 diff --git a/playbooks/controller-ulimits.yaml b/playbooks/controller-ulimits.yaml index dcd5cc8a5..f64ef59de 100644 --- a/playbooks/controller-ulimits.yaml +++ b/playbooks/controller-ulimits.yaml @@ -10,4 +10,4 @@ nofiles_min: 1024 nproc_min: 2048 roles: - - controller-ulimits + - controller_ulimits diff --git a/playbooks/ctlplane-ip-range.yaml b/playbooks/ctlplane-ip-range.yaml index 3ec48a29a..7dbf6234f 100644 --- a/playbooks/ctlplane-ip-range.yaml +++ b/playbooks/ctlplane-ip-range.yaml @@ -10,4 +10,4 @@ - pre-introspection ctlplane_iprange_min_size: 20 roles: - - ctlplane-ip-range + - ctlplane_ip_range diff --git a/playbooks/default-node-count.yaml b/playbooks/default-node-count.yaml index 8438fd70e..d7be62d17 100644 --- a/playbooks/default-node-count.yaml +++ b/playbooks/default-node-count.yaml @@ -9,4 +9,4 @@ groups: - pre-deployment roles: - - default-node-count + - default_node_count diff --git a/playbooks/dhcp-introspection.yaml b/playbooks/dhcp-introspection.yaml index 83d2b1a89..2eb994370 100644 --- a/playbooks/dhcp-introspection.yaml +++ b/playbooks/dhcp-introspection.yaml @@ -14,5 +14,5 @@ - pre-introspection tasks: - include_role: - name: dhcp-validations + name: dhcp_validations tasks_from: dhcp-introspection diff --git a/playbooks/dhcp-provisioning.yaml b/playbooks/dhcp-provisioning.yaml index 1377d1da5..8a381a9ed 100644 --- a/playbooks/dhcp-provisioning.yaml +++ b/playbooks/dhcp-provisioning.yaml @@ -15,5 +15,5 @@ - pre-deployment tasks: - include_role: - name: dhcp-validations + name: dhcp_validations tasks_from: dhcp-provisioning diff --git a/playbooks/healthcheck-service-status.yaml b/playbooks/healthcheck-service-status.yaml index cc2f556e3..58b7bf345 100644 --- a/playbooks/healthcheck-service-status.yaml +++ b/playbooks/healthcheck-service-status.yaml @@ -11,4 +11,4 @@ delay_number: 1 inflight_healthcheck_services: [] roles: - - healthcheck-service-status + - healthcheck_service_status diff --git a/playbooks/image-serve.yaml b/playbooks/image-serve.yaml index 07500514f..77ac3a71d 100644 --- a/playbooks/image-serve.yaml +++ b/playbooks/image-serve.yaml @@ -10,4 +10,4 @@ - post-deployment - post-upgrade roles: - - image-serve + - image_serve diff --git a/playbooks/ironic-boot-configuration.yaml b/playbooks/ironic-boot-configuration.yaml index 6e7db9160..7835d912f 100644 --- a/playbooks/ironic-boot-configuration.yaml +++ b/playbooks/ironic-boot-configuration.yaml @@ -9,4 +9,4 @@ - pre-deployment - pre-upgrade roles: - - ironic-boot-configuration + - ironic_boot_configuration diff --git a/playbooks/mysql-open-files-limit.yaml b/playbooks/mysql-open-files-limit.yaml index 11040d647..d45f2f189 100644 --- a/playbooks/mysql-open-files-limit.yaml +++ b/playbooks/mysql-open-files-limit.yaml @@ -11,4 +11,4 @@ - post-deployment min_open_files_limit: 16384 roles: - - mysql-open-files-limit + - mysql_open_files_limit diff --git a/playbooks/network-environment.yaml b/playbooks/network-environment.yaml index 90bbd61e0..3b79d5725 100644 --- a/playbooks/network-environment.yaml +++ b/playbooks/network-environment.yaml @@ -18,4 +18,4 @@ plan_env_path: plan-environment.yaml ip_pools_path: environments/ips-from-pool-all.yaml roles: - - network-environment + - network_environment diff --git a/playbooks/neutron-sanity-check.yaml b/playbooks/neutron-sanity-check.yaml index 59578f0ec..901bbd49f 100644 --- a/playbooks/neutron-sanity-check.yaml +++ b/playbooks/neutron-sanity-check.yaml @@ -25,4 +25,4 @@ - /etc/neutron/l3_agent.ini roles: - - neutron-sanity-check + - neutron_sanity_check diff --git a/playbooks/no-op-firewall-nova-driver.yaml b/playbooks/no-op-firewall-nova-driver.yaml index fe374f698..d013c3df3 100644 --- a/playbooks/no-op-firewall-nova-driver.yaml +++ b/playbooks/no-op-firewall-nova-driver.yaml @@ -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 diff --git a/playbooks/no-op.yaml b/playbooks/no-op.yaml index 9db33e975..7b1de2b63 100644 --- a/playbooks/no-op.yaml +++ b/playbooks/no-op.yaml @@ -9,4 +9,4 @@ groups: - no-op roles: - - no-op + - no_op diff --git a/playbooks/node-disks.yaml b/playbooks/node-disks.yaml index f2b10b52d..58249990c 100644 --- a/playbooks/node-disks.yaml +++ b/playbooks/node-disks.yaml @@ -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 diff --git a/playbooks/node-health.yaml b/playbooks/node-health.yaml index e5b0b54b0..48acdbd6d 100644 --- a/playbooks/node-health.yaml +++ b/playbooks/node-health.yaml @@ -9,4 +9,4 @@ groups: - pre-upgrade roles: - - node-health + - node_health diff --git a/playbooks/nova-event-callback.yaml b/playbooks/nova-event-callback.yaml index a1f38aa5b..dc5d3cc50 100644 --- a/playbooks/nova-event-callback.yaml +++ b/playbooks/nova-event-callback.yaml @@ -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 diff --git a/playbooks/nova-status.yaml b/playbooks/nova-status.yaml index 4093e63f7..188d0442c 100644 --- a/playbooks/nova-status.yaml +++ b/playbooks/nova-status.yaml @@ -19,4 +19,4 @@ groups: - pre-upgrade roles: - - nova-status + - nova_status diff --git a/playbooks/openshift-hw-requirements.yaml b/playbooks/openshift-hw-requirements.yaml index 1c49b6f09..c76a36463 100644 --- a/playbooks/openshift-hw-requirements.yaml +++ b/playbooks/openshift-hw-requirements.yaml @@ -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 diff --git a/playbooks/openshift-nw-requirements.yaml b/playbooks/openshift-nw-requirements.yaml index b829b2b25..a9d4f8071 100644 --- a/playbooks/openshift-nw-requirements.yaml +++ b/playbooks/openshift-nw-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 diff --git a/playbooks/openstack-endpoints.yaml b/playbooks/openstack-endpoints.yaml index 408a0811b..148f7cf3b 100644 --- a/playbooks/openstack-endpoints.yaml +++ b/playbooks/openstack-endpoints.yaml @@ -12,4 +12,4 @@ - pre-upgrade - post-upgrade roles: - - openstack-endpoints + - openstack_endpoints diff --git a/playbooks/ovs-dpdk-pmd-cpus-check.yaml b/playbooks/ovs-dpdk-pmd-cpus-check.yaml index 1fc89ea97..755364df1 100644 --- a/playbooks/ovs-dpdk-pmd-cpus-check.yaml +++ b/playbooks/ovs-dpdk-pmd-cpus-check.yaml @@ -11,4 +11,4 @@ groups: - post-deployment roles: - - ovs-dpdk-pmd + - ovs_dpdk_pmd diff --git a/playbooks/pacemaker-status.yaml b/playbooks/pacemaker-status.yaml index db5a2c758..739dc6578 100644 --- a/playbooks/pacemaker-status.yaml +++ b/playbooks/pacemaker-status.yaml @@ -12,4 +12,4 @@ groups: - post-deployment roles: - - pacemaker-status + - pacemaker_status diff --git a/playbooks/rabbitmq-limits.yaml b/playbooks/rabbitmq-limits.yaml index 55553d6f1..ce7d98630 100644 --- a/playbooks/rabbitmq-limits.yaml +++ b/playbooks/rabbitmq-limits.yaml @@ -9,4 +9,4 @@ - post-deployment min_fd_limit: 16384 roles: - - rabbitmq-limits + - rabbitmq_limits diff --git a/playbooks/service-status.yaml b/playbooks/service-status.yaml index 5e9f675e7..fda4e67ec 100644 --- a/playbooks/service-status.yaml +++ b/playbooks/service-status.yaml @@ -13,4 +13,4 @@ - post-deployment - post-upgrade roles: - - service-status + - service_status diff --git a/playbooks/stack-health.yaml b/playbooks/stack-health.yaml index f3fe393ea..4f393fff4 100644 --- a/playbooks/stack-health.yaml +++ b/playbooks/stack-health.yaml @@ -10,4 +10,4 @@ - pre-upgrade - post-upgrade roles: - - stack-health + - stack_health diff --git a/playbooks/stonith-exists.yaml b/playbooks/stonith-exists.yaml index bf4070e43..24c9b15f5 100644 --- a/playbooks/stonith-exists.yaml +++ b/playbooks/stonith-exists.yaml @@ -12,4 +12,4 @@ groups: - post-deployment roles: - - stonith-exists + - stonith_exists diff --git a/playbooks/switch-vlans.yaml b/playbooks/switch-vlans.yaml index 05b15feb7..ff113d671 100644 --- a/playbooks/switch-vlans.yaml +++ b/playbooks/switch-vlans.yaml @@ -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 diff --git a/playbooks/tls-everywhere-post-deployment.yaml b/playbooks/tls-everywhere-post-deployment.yaml index e694cacaa..5c1185b47 100644 --- a/playbooks/tls-everywhere-post-deployment.yaml +++ b/playbooks/tls-everywhere-post-deployment.yaml @@ -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 diff --git a/playbooks/tls-everywhere-pre-deployment.yaml b/playbooks/tls-everywhere-pre-deployment.yaml index 11f4cdafa..db9d6addc 100644 --- a/playbooks/tls-everywhere-pre-deployment.yaml +++ b/playbooks/tls-everywhere-pre-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 diff --git a/playbooks/tls-everywhere-prep.yaml b/playbooks/tls-everywhere-prep.yaml index 57374a48a..5f2ab64d8 100644 --- a/playbooks/tls-everywhere-prep.yaml +++ b/playbooks/tls-everywhere-prep.yaml @@ -10,5 +10,5 @@ - prep tasks: - include_role: - name: tls-everywhere + name: tls_everywhere tasks_from: prep.yaml diff --git a/playbooks/undercloud-cpu.yaml b/playbooks/undercloud-cpu.yaml index 772b4dbd2..d945274cc 100644 --- a/playbooks/undercloud-cpu.yaml +++ b/playbooks/undercloud-cpu.yaml @@ -13,4 +13,4 @@ - pre-introspection min_undercloud_cpu_count: 8 roles: - - undercloud-cpu + - undercloud_cpu diff --git a/playbooks/undercloud-debug.yaml b/playbooks/undercloud-debug.yaml index e203156c5..6325a18b8 100644 --- a/playbooks/undercloud-debug.yaml +++ b/playbooks/undercloud-debug.yaml @@ -12,4 +12,4 @@ - pre-deployment debug_check: "True" roles: - - undercloud-debug + - undercloud_debug diff --git a/playbooks/undercloud-disk-space-pre-upgrade.yaml b/playbooks/undercloud-disk-space-pre-upgrade.yaml index bf95dbd77..aff6eb435 100644 --- a/playbooks/undercloud-disk-space-pre-upgrade.yaml +++ b/playbooks/undercloud-disk-space-pre-upgrade.yaml @@ -17,4 +17,4 @@ - {mount: /, min_size: 20} roles: - - undercloud-disk-space + - undercloud_disk_space diff --git a/playbooks/undercloud-disk-space.yaml b/playbooks/undercloud-disk-space.yaml index 8ee78c87e..092f9e18b 100644 --- a/playbooks/undercloud-disk-space.yaml +++ b/playbooks/undercloud-disk-space.yaml @@ -20,4 +20,4 @@ - {mount: /, min_size: 25} roles: - - undercloud-disk-space + - undercloud_disk_space diff --git a/playbooks/undercloud-heat-purge-deleted.yaml b/playbooks/undercloud-heat-purge-deleted.yaml index 2ef02ebbb..dddf7302c 100644 --- a/playbooks/undercloud-heat-purge-deleted.yaml +++ b/playbooks/undercloud-heat-purge-deleted.yaml @@ -12,4 +12,4 @@ - pre-deployment cron_check: "heat-manage purge_deleted" roles: - - undercloud-heat-purge-deleted + - undercloud_heat_purge_deleted diff --git a/playbooks/undercloud-neutron-sanity-check.yaml b/playbooks/undercloud-neutron-sanity-check.yaml index 25c4074b5..037d53ba1 100644 --- a/playbooks/undercloud-neutron-sanity-check.yaml +++ b/playbooks/undercloud-neutron-sanity-check.yaml @@ -26,4 +26,4 @@ - /etc/neutron/l3_agent.ini roles: - - neutron-sanity-check + - neutron_sanity_check diff --git a/playbooks/undercloud-process-count.yaml b/playbooks/undercloud-process-count.yaml index feee9fe25..fb79b44ba 100644 --- a/playbooks/undercloud-process-count.yaml +++ b/playbooks/undercloud-process-count.yaml @@ -12,4 +12,4 @@ - pre-deployment max_process_count: 8 roles: - - undercloud-process-count + - undercloud_process_count diff --git a/playbooks/undercloud-ram.yaml b/playbooks/undercloud-ram.yaml index 7aa04944b..b5145cc3e 100644 --- a/playbooks/undercloud-ram.yaml +++ b/playbooks/undercloud-ram.yaml @@ -14,4 +14,4 @@ - pre-upgrade min_undercloud_ram_gb: 24 roles: - - undercloud-ram + - undercloud_ram diff --git a/playbooks/undercloud-selinux-mode.yaml b/playbooks/undercloud-selinux-mode.yaml index 5d211b0bb..9702334ae 100644 --- a/playbooks/undercloud-selinux-mode.yaml +++ b/playbooks/undercloud-selinux-mode.yaml @@ -10,4 +10,4 @@ - prep - pre-introspection roles: - - undercloud-selinux-mode + - undercloud_selinux_mode diff --git a/playbooks/undercloud-service-status.yaml b/playbooks/undercloud-service-status.yaml index 308345f36..227dd32a0 100644 --- a/playbooks/undercloud-service-status.yaml +++ b/playbooks/undercloud-service-status.yaml @@ -9,4 +9,4 @@ - post-upgrade - pre-upgrade roles: - - undercloud-service-status + - undercloud_service_status diff --git a/playbooks/undercloud-tokenflush.yaml b/playbooks/undercloud-tokenflush.yaml index 49641a5bd..2490352d3 100644 --- a/playbooks/undercloud-tokenflush.yaml +++ b/playbooks/undercloud-tokenflush.yaml @@ -11,4 +11,4 @@ - pre-introspection cron_check: "keystone-manage token_flush" roles: - - undercloud-tokenflush + - undercloud_tokenflush diff --git a/playbooks/validate-selinux.yaml b/playbooks/validate-selinux.yaml index 92f275f8b..cf2939009 100644 --- a/playbooks/validate-selinux.yaml +++ b/playbooks/validate-selinux.yaml @@ -18,4 +18,4 @@ validate_selinux_filter: "None" validate_selinux_skip_list: {} roles: - - validate-selinux + - validate_selinux diff --git a/roles/advanced-format-512e-support/tasks/main.yml b/roles/advanced_format_512e_support/tasks/main.yml similarity index 100% rename from roles/advanced-format-512e-support/tasks/main.yml rename to roles/advanced_format_512e_support/tasks/main.yml diff --git a/roles/advanced-format-512e-support/vars/main.yml b/roles/advanced_format_512e_support/vars/main.yml similarity index 100% rename from roles/advanced-format-512e-support/vars/main.yml rename to roles/advanced_format_512e_support/vars/main.yml diff --git a/roles/ceilometerdb-size/defaults/main.yml b/roles/ceilometerdb_size/defaults/main.yml similarity index 100% rename from roles/ceilometerdb-size/defaults/main.yml rename to roles/ceilometerdb_size/defaults/main.yml diff --git a/roles/ceilometerdb-size/tasks/main.yml b/roles/ceilometerdb_size/tasks/main.yml similarity index 100% rename from roles/ceilometerdb-size/tasks/main.yml rename to roles/ceilometerdb_size/tasks/main.yml diff --git a/roles/ceilometerdb-size/vars/main.yml b/roles/ceilometerdb_size/vars/main.yml similarity index 100% rename from roles/ceilometerdb-size/vars/main.yml rename to roles/ceilometerdb_size/vars/main.yml diff --git a/roles/check-latest-packages-version/defaults/main.yml b/roles/check_latest_packages_version/defaults/main.yml similarity index 100% rename from roles/check-latest-packages-version/defaults/main.yml rename to roles/check_latest_packages_version/defaults/main.yml diff --git a/roles/check-latest-packages-version/molecule/default/Dockerfile.j2 b/roles/check_latest_packages_version/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/check-latest-packages-version/molecule/default/Dockerfile.j2 rename to roles/check_latest_packages_version/molecule/default/Dockerfile.j2 diff --git a/roles/check-latest-packages-version/molecule/default/molecule.yml b/roles/check_latest_packages_version/molecule/default/molecule.yml similarity index 100% rename from roles/check-latest-packages-version/molecule/default/molecule.yml rename to roles/check_latest_packages_version/molecule/default/molecule.yml diff --git a/roles/check-latest-packages-version/molecule/default/playbook.yml b/roles/check_latest_packages_version/molecule/default/playbook.yml similarity index 88% rename from roles/check-latest-packages-version/molecule/default/playbook.yml rename to roles/check_latest_packages_version/molecule/default/playbook.yml index 953905777..db4a659fb 100644 --- a/roles/check-latest-packages-version/molecule/default/playbook.yml +++ b/roles/check_latest_packages_version/molecule/default/playbook.yml @@ -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. diff --git a/roles/check-latest-packages-version/molecule/default/prepare.yml b/roles/check_latest_packages_version/molecule/default/prepare.yml similarity index 100% rename from roles/check-latest-packages-version/molecule/default/prepare.yml rename to roles/check_latest_packages_version/molecule/default/prepare.yml diff --git a/roles/check-latest-packages-version/tasks/main.yml b/roles/check_latest_packages_version/tasks/main.yml similarity index 100% rename from roles/check-latest-packages-version/tasks/main.yml rename to roles/check_latest_packages_version/tasks/main.yml diff --git a/roles/check-latest-packages-version/vars/main.yml b/roles/check_latest_packages_version/vars/main.yml similarity index 100% rename from roles/check-latest-packages-version/vars/main.yml rename to roles/check_latest_packages_version/vars/main.yml diff --git a/roles/check-network-gateway/molecule/default/Dockerfile.j2 b/roles/check_network_gateway/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/check-network-gateway/molecule/default/Dockerfile.j2 rename to roles/check_network_gateway/molecule/default/Dockerfile.j2 diff --git a/roles/check-network-gateway/molecule/default/molecule.yml b/roles/check_network_gateway/molecule/default/molecule.yml similarity index 100% rename from roles/check-network-gateway/molecule/default/molecule.yml rename to roles/check_network_gateway/molecule/default/molecule.yml diff --git a/roles/check-network-gateway/molecule/default/playbook.yml b/roles/check_network_gateway/molecule/default/playbook.yml similarity index 90% rename from roles/check-network-gateway/molecule/default/playbook.yml rename to roles/check_network_gateway/molecule/default/playbook.yml index 52d9d4ebf..731a19f16 100644 --- a/roles/check-network-gateway/molecule/default/playbook.yml +++ b/roles/check_network_gateway/molecule/default/playbook.yml @@ -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! diff --git a/roles/check-network-gateway/molecule/default/prepare.yml b/roles/check_network_gateway/molecule/default/prepare.yml similarity index 100% rename from roles/check-network-gateway/molecule/default/prepare.yml rename to roles/check_network_gateway/molecule/default/prepare.yml diff --git a/roles/check-network-gateway/tasks/main.yml b/roles/check_network_gateway/tasks/main.yml similarity index 100% rename from roles/check-network-gateway/tasks/main.yml rename to roles/check_network_gateway/tasks/main.yml diff --git a/roles/check-network-gateway/vars/main.yml b/roles/check_network_gateway/vars/main.yml similarity index 100% rename from roles/check-network-gateway/vars/main.yml rename to roles/check_network_gateway/vars/main.yml diff --git a/roles/collect-flavors-and-verify-profiles/tasks/main.yml b/roles/collect_flavors_and_verify_profiles/tasks/main.yml similarity index 100% rename from roles/collect-flavors-and-verify-profiles/tasks/main.yml rename to roles/collect_flavors_and_verify_profiles/tasks/main.yml diff --git a/roles/collect-flavors-and-verify-profiles/vars/main.yml b/roles/collect_flavors_and_verify_profiles/vars/main.yml similarity index 100% rename from roles/collect-flavors-and-verify-profiles/vars/main.yml rename to roles/collect_flavors_and_verify_profiles/vars/main.yml diff --git a/roles/container-status/tasks/main.yaml b/roles/container_status/tasks/main.yaml similarity index 100% rename from roles/container-status/tasks/main.yaml rename to roles/container_status/tasks/main.yaml diff --git a/roles/containerized-undercloud-docker/defaults/main.yml b/roles/containerized_undercloud_docker/defaults/main.yml similarity index 100% rename from roles/containerized-undercloud-docker/defaults/main.yml rename to roles/containerized_undercloud_docker/defaults/main.yml diff --git a/roles/containerized-undercloud-docker/tasks/main.yml b/roles/containerized_undercloud_docker/tasks/main.yml similarity index 100% rename from roles/containerized-undercloud-docker/tasks/main.yml rename to roles/containerized_undercloud_docker/tasks/main.yml diff --git a/roles/containerized-undercloud-docker/vars/main.yml b/roles/containerized_undercloud_docker/vars/main.yml similarity index 100% rename from roles/containerized-undercloud-docker/vars/main.yml rename to roles/containerized_undercloud_docker/vars/main.yml diff --git a/roles/controller-token/defaults/main.yml b/roles/controller_token/defaults/main.yml similarity index 100% rename from roles/controller-token/defaults/main.yml rename to roles/controller_token/defaults/main.yml diff --git a/roles/controller-token/molecule/default/Dockerfile.j2 b/roles/controller_token/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/controller-token/molecule/default/Dockerfile.j2 rename to roles/controller_token/molecule/default/Dockerfile.j2 diff --git a/roles/controller-token/molecule/default/molecule.yml b/roles/controller_token/molecule/default/molecule.yml similarity index 100% rename from roles/controller-token/molecule/default/molecule.yml rename to roles/controller_token/molecule/default/molecule.yml diff --git a/roles/controller-token/molecule/default/playbook.yml b/roles/controller_token/molecule/default/playbook.yml similarity index 95% rename from roles/controller-token/molecule/default/playbook.yml rename to roles/controller_token/molecule/default/playbook.yml index 49be315b0..5952826b6 100644 --- a/roles/controller-token/molecule/default/playbook.yml +++ b/roles/controller_token/molecule/default/playbook.yml @@ -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: diff --git a/roles/controller-token/tasks/main.yml b/roles/controller_token/tasks/main.yml similarity index 100% rename from roles/controller-token/tasks/main.yml rename to roles/controller_token/tasks/main.yml diff --git a/roles/controller-token/vars/main.yml b/roles/controller_token/vars/main.yml similarity index 100% rename from roles/controller-token/vars/main.yml rename to roles/controller_token/vars/main.yml diff --git a/roles/controller-ulimits/defaults/main.yml b/roles/controller_ulimits/defaults/main.yml similarity index 100% rename from roles/controller-ulimits/defaults/main.yml rename to roles/controller_ulimits/defaults/main.yml diff --git a/roles/controller-ulimits/molecule/default/Dockerfile.j2 b/roles/controller_ulimits/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/controller-ulimits/molecule/default/Dockerfile.j2 rename to roles/controller_ulimits/molecule/default/Dockerfile.j2 diff --git a/roles/controller-ulimits/molecule/default/molecule.yml b/roles/controller_ulimits/molecule/default/molecule.yml similarity index 100% rename from roles/controller-ulimits/molecule/default/molecule.yml rename to roles/controller_ulimits/molecule/default/molecule.yml diff --git a/roles/controller-ulimits/molecule/default/playbook.yml b/roles/controller_ulimits/molecule/default/playbook.yml similarity index 96% rename from roles/controller-ulimits/molecule/default/playbook.yml rename to roles/controller_ulimits/molecule/default/playbook.yml index c71c231cb..9eec7f971 100644 --- a/roles/controller-ulimits/molecule/default/playbook.yml +++ b/roles/controller_ulimits/molecule/default/playbook.yml @@ -26,7 +26,7 @@ tasks: - block: - include_role: - name: controller-ulimits + name: controller_ulimits rescue: - name: Clear host errors meta: clear_host_errors diff --git a/roles/controller-ulimits/tasks/main.yml b/roles/controller_ulimits/tasks/main.yml similarity index 100% rename from roles/controller-ulimits/tasks/main.yml rename to roles/controller_ulimits/tasks/main.yml diff --git a/roles/controller-ulimits/vars/main.yml b/roles/controller_ulimits/vars/main.yml similarity index 100% rename from roles/controller-ulimits/vars/main.yml rename to roles/controller_ulimits/vars/main.yml diff --git a/roles/ctlplane-ip-range/defaults/main.yml b/roles/ctlplane_ip_range/defaults/main.yml similarity index 100% rename from roles/ctlplane-ip-range/defaults/main.yml rename to roles/ctlplane_ip_range/defaults/main.yml diff --git a/roles/ctlplane-ip-range/molecule/default/Dockerfile.j2 b/roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/ctlplane-ip-range/molecule/default/Dockerfile.j2 rename to roles/ctlplane_ip_range/molecule/default/Dockerfile.j2 diff --git a/roles/ctlplane-ip-range/molecule/default/molecule.yml b/roles/ctlplane_ip_range/molecule/default/molecule.yml similarity index 100% rename from roles/ctlplane-ip-range/molecule/default/molecule.yml rename to roles/ctlplane_ip_range/molecule/default/molecule.yml diff --git a/roles/ctlplane-ip-range/molecule/default/playbook.yml b/roles/ctlplane_ip_range/molecule/default/playbook.yml similarity index 96% rename from roles/ctlplane-ip-range/molecule/default/playbook.yml rename to roles/ctlplane_ip_range/molecule/default/playbook.yml index 36542a07e..7fc750abf 100644 --- a/roles/ctlplane-ip-range/molecule/default/playbook.yml +++ b/roles/ctlplane_ip_range/molecule/default/playbook.yml @@ -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 diff --git a/roles/ctlplane-ip-range/molecule/default/prepare.yml b/roles/ctlplane_ip_range/molecule/default/prepare.yml similarity index 100% rename from roles/ctlplane-ip-range/molecule/default/prepare.yml rename to roles/ctlplane_ip_range/molecule/default/prepare.yml diff --git a/roles/ctlplane-ip-range/tasks/main.yml b/roles/ctlplane_ip_range/tasks/main.yml similarity index 100% rename from roles/ctlplane-ip-range/tasks/main.yml rename to roles/ctlplane_ip_range/tasks/main.yml diff --git a/roles/ctlplane-ip-range/vars/main.yml b/roles/ctlplane_ip_range/vars/main.yml similarity index 100% rename from roles/ctlplane-ip-range/vars/main.yml rename to roles/ctlplane_ip_range/vars/main.yml diff --git a/roles/default-node-count/tasks/main.yml b/roles/default_node_count/tasks/main.yml similarity index 100% rename from roles/default-node-count/tasks/main.yml rename to roles/default_node_count/tasks/main.yml diff --git a/roles/default-node-count/vars/main.yml b/roles/default_node_count/vars/main.yml similarity index 100% rename from roles/default-node-count/vars/main.yml rename to roles/default_node_count/vars/main.yml diff --git a/roles/dhcp-validations/defaults/main.yml b/roles/dhcp_validations/defaults/main.yml similarity index 100% rename from roles/dhcp-validations/defaults/main.yml rename to roles/dhcp_validations/defaults/main.yml diff --git a/roles/dhcp-validations/files/rogue_dhcp.py b/roles/dhcp_validations/files/rogue_dhcp.py similarity index 100% rename from roles/dhcp-validations/files/rogue_dhcp.py rename to roles/dhcp_validations/files/rogue_dhcp.py diff --git a/roles/dhcp-validations/tasks/dhcp-introspection.yaml b/roles/dhcp_validations/tasks/dhcp-introspection.yaml similarity index 100% rename from roles/dhcp-validations/tasks/dhcp-introspection.yaml rename to roles/dhcp_validations/tasks/dhcp-introspection.yaml diff --git a/roles/dhcp-validations/tasks/dhcp-provisioning.yaml b/roles/dhcp_validations/tasks/dhcp-provisioning.yaml similarity index 100% rename from roles/dhcp-validations/tasks/dhcp-provisioning.yaml rename to roles/dhcp_validations/tasks/dhcp-provisioning.yaml diff --git a/roles/healthcheck_service_status/defaults/main.yml b/roles/healthcheck_service_status/defaults/main.yml new file mode 100644 index 000000000..8c829ad4f --- /dev/null +++ b/roles/healthcheck_service_status/defaults/main.yml @@ -0,0 +1,8 @@ +--- +# The default values for the two following variables are set up to wait up to +# 300s for the first healthcheck to run. +retries_number: 10 +delay_number: 30 +# Please use inflight_healtcheck_services when using this role through the +# inflight validations. +inflight_healthcheck_services: [] diff --git a/roles/healthcheck_service_status/tasks/main.yml b/roles/healthcheck_service_status/tasks/main.yml new file mode 100644 index 000000000..8a46217ec --- /dev/null +++ b/roles/healthcheck_service_status/tasks/main.yml @@ -0,0 +1,34 @@ +--- +- name: Get the healthcheck services list enabled on node + shell: > + systemctl list-unit-files | grep "^tripleo.*healthcheck.*enabled" | awk -F'.' '{print $1}' + changed_when: false + register: healthcheck_services_list + when: inflight_healthcheck_services | length < 1 + +- name: Set hc_services + set_fact: + hc_services: > + {%- if inflight_healthcheck_services | length > 0 -%} + {{ inflight_healthcheck_services }} + {%- else -%} + {{ healthcheck_services_list.stdout_lines }} + {%- endif -%} + +- name: "[Healthcheck] Get {{ item }} status" + systemd: + name: "{{ item }}" + retries: "{{ retries_number|int }}" + delay: "{{ delay_number|int }}" + until: + - systemd_healthcheck_state.status.ExecMainPID != '0' + - systemd_healthcheck_state.status.ActiveState in ['inactive', 'failed'] + ignore_errors: true + register: systemd_healthcheck_state + with_items: "{{ hc_services }}" + +- name: Fail if systemd healthcheck services are in failed status + fail: + msg: "Failed systemd healthcheck service detected: {{ item.item }}" + when: item.status.ExecMainStatus != '0' + loop: "{{ systemd_healthcheck_state.results }}" diff --git a/roles/healthcheck_service_status/vars/main.yml b/roles/healthcheck_service_status/vars/main.yml new file mode 100644 index 000000000..a3c7f80ec --- /dev/null +++ b/roles/healthcheck_service_status/vars/main.yml @@ -0,0 +1,7 @@ +--- +metadata: + name: Healthcheck systemd services Check + description: > + Check for failed healthcheck systemd services. + groups: + - post-deployment diff --git a/roles/image-serve/defaults/main.yaml b/roles/image_serve/defaults/main.yaml similarity index 100% rename from roles/image-serve/defaults/main.yaml rename to roles/image_serve/defaults/main.yaml diff --git a/roles/image-serve/molecule/default/Dockerfile.j2 b/roles/image_serve/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/image-serve/molecule/default/Dockerfile.j2 rename to roles/image_serve/molecule/default/Dockerfile.j2 diff --git a/roles/image-serve/molecule/default/molecule.yml b/roles/image_serve/molecule/default/molecule.yml similarity index 100% rename from roles/image-serve/molecule/default/molecule.yml rename to roles/image_serve/molecule/default/molecule.yml diff --git a/roles/image-serve/molecule/default/playbook.yml b/roles/image_serve/molecule/default/playbook.yml similarity index 92% rename from roles/image-serve/molecule/default/playbook.yml rename to roles/image_serve/molecule/default/playbook.yml index ffe0169ba..00f835ffc 100644 --- a/roles/image-serve/molecule/default/playbook.yml +++ b/roles/image_serve/molecule/default/playbook.yml @@ -24,7 +24,7 @@ block: - name: run validation for wrong port include_role: - name: image-serve + name: image_serve vars: container_registry_port: 9999 rescue: @@ -39,7 +39,7 @@ block: - name: run validation for 404 include_role: - name: image-serve + name: image_serve rescue: - name: Clear host errors meta: clear_host_errors @@ -54,5 +54,5 @@ - name: Fail the test fail: msg: | - The image-serve role should have detected httpd wasn't running or + The image_serve role should have detected httpd wasn't running or index.json is absent. diff --git a/roles/image-serve/molecule/default/prepare.yml b/roles/image_serve/molecule/default/prepare.yml similarity index 100% rename from roles/image-serve/molecule/default/prepare.yml rename to roles/image_serve/molecule/default/prepare.yml diff --git a/roles/image-serve/tasks/main.yaml b/roles/image_serve/tasks/main.yaml similarity index 100% rename from roles/image-serve/tasks/main.yaml rename to roles/image_serve/tasks/main.yaml diff --git a/roles/image-serve/vars/main.yml b/roles/image_serve/vars/main.yml similarity index 100% rename from roles/image-serve/vars/main.yml rename to roles/image_serve/vars/main.yml diff --git a/roles/ironic-boot-configuration/defaults/main.yml b/roles/ironic_boot_configuration/defaults/main.yml similarity index 100% rename from roles/ironic-boot-configuration/defaults/main.yml rename to roles/ironic_boot_configuration/defaults/main.yml diff --git a/roles/ironic-boot-configuration/tasks/main.yml b/roles/ironic_boot_configuration/tasks/main.yml similarity index 100% rename from roles/ironic-boot-configuration/tasks/main.yml rename to roles/ironic_boot_configuration/tasks/main.yml diff --git a/roles/ironic-boot-configuration/vars/main.yml b/roles/ironic_boot_configuration/vars/main.yml similarity index 100% rename from roles/ironic-boot-configuration/vars/main.yml rename to roles/ironic_boot_configuration/vars/main.yml diff --git a/roles/mysql-open-files-limit/defaults/main.yml b/roles/mysql_open_files_limit/defaults/main.yml similarity index 100% rename from roles/mysql-open-files-limit/defaults/main.yml rename to roles/mysql_open_files_limit/defaults/main.yml diff --git a/roles/mysql-open-files-limit/tasks/main.yml b/roles/mysql_open_files_limit/tasks/main.yml similarity index 100% rename from roles/mysql-open-files-limit/tasks/main.yml rename to roles/mysql_open_files_limit/tasks/main.yml diff --git a/roles/mysql-open-files-limit/vars/main.yml b/roles/mysql_open_files_limit/vars/main.yml similarity index 100% rename from roles/mysql-open-files-limit/vars/main.yml rename to roles/mysql_open_files_limit/vars/main.yml diff --git a/roles/network-environment/defaults/main.yml b/roles/network_environment/defaults/main.yml similarity index 100% rename from roles/network-environment/defaults/main.yml rename to roles/network_environment/defaults/main.yml diff --git a/roles/network-environment/tasks/main.yml b/roles/network_environment/tasks/main.yml similarity index 100% rename from roles/network-environment/tasks/main.yml rename to roles/network_environment/tasks/main.yml diff --git a/roles/network-environment/vars/main.yml b/roles/network_environment/vars/main.yml similarity index 100% rename from roles/network-environment/vars/main.yml rename to roles/network_environment/vars/main.yml diff --git a/roles/neutron-sanity-check/defaults/main.yml b/roles/neutron_sanity_check/defaults/main.yml similarity index 100% rename from roles/neutron-sanity-check/defaults/main.yml rename to roles/neutron_sanity_check/defaults/main.yml diff --git a/roles/neutron-sanity-check/tasks/main.yml b/roles/neutron_sanity_check/tasks/main.yml similarity index 100% rename from roles/neutron-sanity-check/tasks/main.yml rename to roles/neutron_sanity_check/tasks/main.yml diff --git a/roles/no-op/tasks/main.yml b/roles/no_op/tasks/main.yml similarity index 100% rename from roles/no-op/tasks/main.yml rename to roles/no_op/tasks/main.yml diff --git a/roles/no-op/vars/main.yml b/roles/no_op/vars/main.yml similarity index 100% rename from roles/no-op/vars/main.yml rename to roles/no_op/vars/main.yml diff --git a/roles/no-op-firewall-nova-driver/defaults/main.yml b/roles/no_op_firewall_nova_driver/defaults/main.yml similarity index 100% rename from roles/no-op-firewall-nova-driver/defaults/main.yml rename to roles/no_op_firewall_nova_driver/defaults/main.yml diff --git a/roles/no-op-firewall-nova-driver/molecule/default/Dockerfile.j2 b/roles/no_op_firewall_nova_driver/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/no-op-firewall-nova-driver/molecule/default/Dockerfile.j2 rename to roles/no_op_firewall_nova_driver/molecule/default/Dockerfile.j2 diff --git a/roles/no-op-firewall-nova-driver/molecule/default/molecule.yml b/roles/no_op_firewall_nova_driver/molecule/default/molecule.yml similarity index 100% rename from roles/no-op-firewall-nova-driver/molecule/default/molecule.yml rename to roles/no_op_firewall_nova_driver/molecule/default/molecule.yml diff --git a/roles/no-op-firewall-nova-driver/molecule/default/playbook.yml b/roles/no_op_firewall_nova_driver/molecule/default/playbook.yml similarity index 95% rename from roles/no-op-firewall-nova-driver/molecule/default/playbook.yml rename to roles/no_op_firewall_nova_driver/molecule/default/playbook.yml index 77beec6ed..83f413f85 100644 --- a/roles/no-op-firewall-nova-driver/molecule/default/playbook.yml +++ b/roles/no_op_firewall_nova_driver/molecule/default/playbook.yml @@ -33,7 +33,7 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver - include_role: - name: no-op-firewall-nova-driver + name: no_op_firewall_nova_driver vars: nova_conf_path: "/nova.conf" @@ -51,7 +51,7 @@ backup: true - include_role: - name: no-op-firewall-nova-driver + name: no_op_firewall_nova_driver vars: nova_conf_path: "/nova.conf" rescue: diff --git a/roles/no-op-firewall-nova-driver/tasks/main.yml b/roles/no_op_firewall_nova_driver/tasks/main.yml similarity index 100% rename from roles/no-op-firewall-nova-driver/tasks/main.yml rename to roles/no_op_firewall_nova_driver/tasks/main.yml diff --git a/roles/no-op-firewall-nova-driver/vars/main.yml b/roles/no_op_firewall_nova_driver/vars/main.yml similarity index 100% rename from roles/no-op-firewall-nova-driver/vars/main.yml rename to roles/no_op_firewall_nova_driver/vars/main.yml diff --git a/roles/node-disks/defaults/main.yml b/roles/node_disks/defaults/main.yml similarity index 100% rename from roles/node-disks/defaults/main.yml rename to roles/node_disks/defaults/main.yml diff --git a/roles/node-disks/tasks/main.yml b/roles/node_disks/tasks/main.yml similarity index 100% rename from roles/node-disks/tasks/main.yml rename to roles/node_disks/tasks/main.yml diff --git a/roles/node-disks/vars/main.yml b/roles/node_disks/vars/main.yml similarity index 100% rename from roles/node-disks/vars/main.yml rename to roles/node_disks/vars/main.yml diff --git a/roles/node-health/tasks/main.yml b/roles/node_health/tasks/main.yml similarity index 100% rename from roles/node-health/tasks/main.yml rename to roles/node_health/tasks/main.yml diff --git a/roles/node-health/templates/unreachable_nodes.j2 b/roles/node_health/templates/unreachable_nodes.j2 similarity index 100% rename from roles/node-health/templates/unreachable_nodes.j2 rename to roles/node_health/templates/unreachable_nodes.j2 diff --git a/roles/node-health/vars/main.yml b/roles/node_health/vars/main.yml similarity index 100% rename from roles/node-health/vars/main.yml rename to roles/node_health/vars/main.yml diff --git a/roles/nova-event-callback/defaults/main.yml b/roles/nova_event_callback/defaults/main.yml similarity index 100% rename from roles/nova-event-callback/defaults/main.yml rename to roles/nova_event_callback/defaults/main.yml diff --git a/roles/nova-event-callback/tasks/main.yml b/roles/nova_event_callback/tasks/main.yml similarity index 100% rename from roles/nova-event-callback/tasks/main.yml rename to roles/nova_event_callback/tasks/main.yml diff --git a/roles/nova-event-callback/vars/main.yml b/roles/nova_event_callback/vars/main.yml similarity index 100% rename from roles/nova-event-callback/vars/main.yml rename to roles/nova_event_callback/vars/main.yml diff --git a/roles/nova-status/molecule/default/Dockerfile.j2 b/roles/nova_status/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/nova-status/molecule/default/Dockerfile.j2 rename to roles/nova_status/molecule/default/Dockerfile.j2 diff --git a/roles/nova-status/molecule/default/molecule.yml b/roles/nova_status/molecule/default/molecule.yml similarity index 100% rename from roles/nova-status/molecule/default/molecule.yml rename to roles/nova_status/molecule/default/molecule.yml diff --git a/roles/nova-status/molecule/default/playbook.yml b/roles/nova_status/molecule/default/playbook.yml similarity index 90% rename from roles/nova-status/molecule/default/playbook.yml rename to roles/nova_status/molecule/default/playbook.yml index a9c1ca31a..d7a39ab4b 100644 --- a/roles/nova-status/molecule/default/playbook.yml +++ b/roles/nova_status/molecule/default/playbook.yml @@ -22,13 +22,13 @@ tasks: - name: working detection include_role: - name: nova-status + name: nova_status - name: make validation fail block: - name: run validation include_role: - name: nova-status + name: nova_status vars: container_cli: docker @@ -46,5 +46,5 @@ - name: Fail playbook if reached fail: msg: | - The nova-status validation didn't properly detect bad upgrade + The nova_status validation didn't properly detect bad upgrade status check! diff --git a/roles/nova-status/molecule/default/prepare.yml b/roles/nova_status/molecule/default/prepare.yml similarity index 100% rename from roles/nova-status/molecule/default/prepare.yml rename to roles/nova_status/molecule/default/prepare.yml diff --git a/roles/nova-status/tasks/main.yml b/roles/nova_status/tasks/main.yml similarity index 100% rename from roles/nova-status/tasks/main.yml rename to roles/nova_status/tasks/main.yml diff --git a/roles/nova-status/vars/main.yml b/roles/nova_status/vars/main.yml similarity index 100% rename from roles/nova-status/vars/main.yml rename to roles/nova_status/vars/main.yml diff --git a/roles/openshift-on-openstack/defaults/main.yml b/roles/openshift_on_openstack/defaults/main.yml similarity index 100% rename from roles/openshift-on-openstack/defaults/main.yml rename to roles/openshift_on_openstack/defaults/main.yml diff --git a/roles/openshift-on-openstack/tasks/openshift-hw-requirements.yaml b/roles/openshift_on_openstack/tasks/openshift-hw-requirements.yaml similarity index 100% rename from roles/openshift-on-openstack/tasks/openshift-hw-requirements.yaml rename to roles/openshift_on_openstack/tasks/openshift-hw-requirements.yaml diff --git a/roles/openshift-on-openstack/tasks/openshift-nw-requirements.yaml b/roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml similarity index 100% rename from roles/openshift-on-openstack/tasks/openshift-nw-requirements.yaml rename to roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml diff --git a/roles/openshift-on-openstack/templates/openshift-hw-requirements-warnings.j2 b/roles/openshift_on_openstack/templates/openshift-hw-requirements-warnings.j2 similarity index 100% rename from roles/openshift-on-openstack/templates/openshift-hw-requirements-warnings.j2 rename to roles/openshift_on_openstack/templates/openshift-hw-requirements-warnings.j2 diff --git a/roles/openstack-endpoints/tasks/main.yml b/roles/openstack_endpoints/tasks/main.yml similarity index 100% rename from roles/openstack-endpoints/tasks/main.yml rename to roles/openstack_endpoints/tasks/main.yml diff --git a/roles/openstack-endpoints/vars/main.yml b/roles/openstack_endpoints/vars/main.yml similarity index 100% rename from roles/openstack-endpoints/vars/main.yml rename to roles/openstack_endpoints/vars/main.yml diff --git a/roles/ovs-dpdk-pmd/defaults/main.yml b/roles/ovs_dpdk_pmd/defaults/main.yml similarity index 100% rename from roles/ovs-dpdk-pmd/defaults/main.yml rename to roles/ovs_dpdk_pmd/defaults/main.yml diff --git a/roles/ovs-dpdk-pmd/tasks/main.yml b/roles/ovs_dpdk_pmd/tasks/main.yml similarity index 100% rename from roles/ovs-dpdk-pmd/tasks/main.yml rename to roles/ovs_dpdk_pmd/tasks/main.yml diff --git a/roles/ovs-dpdk-pmd/vars/main.yml b/roles/ovs_dpdk_pmd/vars/main.yml similarity index 100% rename from roles/ovs-dpdk-pmd/vars/main.yml rename to roles/ovs_dpdk_pmd/vars/main.yml diff --git a/roles/pacemaker-status/defaults/main.yml b/roles/pacemaker_status/defaults/main.yml similarity index 100% rename from roles/pacemaker-status/defaults/main.yml rename to roles/pacemaker_status/defaults/main.yml diff --git a/roles/pacemaker-status/tasks/main.yml b/roles/pacemaker_status/tasks/main.yml similarity index 100% rename from roles/pacemaker-status/tasks/main.yml rename to roles/pacemaker_status/tasks/main.yml diff --git a/roles/pacemaker-status/vars/main.yml b/roles/pacemaker_status/vars/main.yml similarity index 100% rename from roles/pacemaker-status/vars/main.yml rename to roles/pacemaker_status/vars/main.yml diff --git a/roles/rabbitmq-limits/defaults/main.yml b/roles/rabbitmq_limits/defaults/main.yml similarity index 100% rename from roles/rabbitmq-limits/defaults/main.yml rename to roles/rabbitmq_limits/defaults/main.yml diff --git a/roles/rabbitmq-limits/molecule/default/Dockerfile.j2 b/roles/rabbitmq_limits/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/rabbitmq-limits/molecule/default/Dockerfile.j2 rename to roles/rabbitmq_limits/molecule/default/Dockerfile.j2 diff --git a/roles/rabbitmq-limits/molecule/default/molecule.yml b/roles/rabbitmq_limits/molecule/default/molecule.yml similarity index 100% rename from roles/rabbitmq-limits/molecule/default/molecule.yml rename to roles/rabbitmq_limits/molecule/default/molecule.yml diff --git a/roles/rabbitmq-limits/molecule/default/playbook.yml b/roles/rabbitmq_limits/molecule/default/playbook.yml similarity index 90% rename from roles/rabbitmq-limits/molecule/default/playbook.yml rename to roles/rabbitmq_limits/molecule/default/playbook.yml index 4a107517f..5f3e1a17a 100644 --- a/roles/rabbitmq-limits/molecule/default/playbook.yml +++ b/roles/rabbitmq_limits/molecule/default/playbook.yml @@ -22,13 +22,13 @@ tasks: - name: working detection include_role: - name: rabbitmq-limits + name: rabbitmq_limits - name: make validation fail block: - name: run validation include_role: - name: rabbitmq-limits + name: rabbitmq_limits vars: container_cli: docker @@ -46,5 +46,5 @@ - name: Fail playbook if reached fail: msg: | - The rabbitmq-limits validation didn't properly detect bad rabbitmq + The rabbitmq_limits validation didn't properly detect bad rabbitmq setting! diff --git a/roles/rabbitmq-limits/molecule/default/prepare.yml b/roles/rabbitmq_limits/molecule/default/prepare.yml similarity index 100% rename from roles/rabbitmq-limits/molecule/default/prepare.yml rename to roles/rabbitmq_limits/molecule/default/prepare.yml diff --git a/roles/rabbitmq-limits/tasks/main.yml b/roles/rabbitmq_limits/tasks/main.yml similarity index 100% rename from roles/rabbitmq-limits/tasks/main.yml rename to roles/rabbitmq_limits/tasks/main.yml diff --git a/roles/rabbitmq-limits/vars/main.yml b/roles/rabbitmq_limits/vars/main.yml similarity index 100% rename from roles/rabbitmq-limits/vars/main.yml rename to roles/rabbitmq_limits/vars/main.yml diff --git a/roles/service-status/tasks/main.yaml b/roles/service_status/tasks/main.yaml similarity index 100% rename from roles/service-status/tasks/main.yaml rename to roles/service_status/tasks/main.yaml diff --git a/roles/stack-health/tasks/main.yml b/roles/stack_health/tasks/main.yml similarity index 100% rename from roles/stack-health/tasks/main.yml rename to roles/stack_health/tasks/main.yml diff --git a/roles/stack-health/vars/main.yml b/roles/stack_health/vars/main.yml similarity index 100% rename from roles/stack-health/vars/main.yml rename to roles/stack_health/vars/main.yml diff --git a/roles/stonith-exists/molecule/default/Dockerfile.j2 b/roles/stonith_exists/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/stonith-exists/molecule/default/Dockerfile.j2 rename to roles/stonith_exists/molecule/default/Dockerfile.j2 diff --git a/roles/stonith-exists/molecule/default/molecule.yml b/roles/stonith_exists/molecule/default/molecule.yml similarity index 100% rename from roles/stonith-exists/molecule/default/molecule.yml rename to roles/stonith_exists/molecule/default/molecule.yml diff --git a/roles/stonith-exists/molecule/default/playbook.yml b/roles/stonith_exists/molecule/default/playbook.yml similarity index 91% rename from roles/stonith-exists/molecule/default/playbook.yml rename to roles/stonith_exists/molecule/default/playbook.yml index 91def951d..aefd9ff97 100644 --- a/roles/stonith-exists/molecule/default/playbook.yml +++ b/roles/stonith_exists/molecule/default/playbook.yml @@ -21,7 +21,7 @@ tasks: - name: Safe run include_role: - name: stonith-exists + name: stonith_exists - name: Fail the validation block: @@ -36,7 +36,7 @@ - name: Run validation include_role: - name: stonith-exists + name: stonith_exists rescue: - name: Clear host errors @@ -52,5 +52,5 @@ - name: Fail playbook if reached fail: msg: | - The stonith-exists validation didn't properly detect failed + The stonith_exists validation didn't properly detect failed stonith config diff --git a/roles/stonith-exists/molecule/default/prepare.yml b/roles/stonith_exists/molecule/default/prepare.yml similarity index 100% rename from roles/stonith-exists/molecule/default/prepare.yml rename to roles/stonith_exists/molecule/default/prepare.yml diff --git a/roles/stonith-exists/tasks/main.yml b/roles/stonith_exists/tasks/main.yml similarity index 100% rename from roles/stonith-exists/tasks/main.yml rename to roles/stonith_exists/tasks/main.yml diff --git a/roles/stonith-exists/vars/main.yml b/roles/stonith_exists/vars/main.yml similarity index 100% rename from roles/stonith-exists/vars/main.yml rename to roles/stonith_exists/vars/main.yml diff --git a/roles/switch-vlans/defaults/main.yml b/roles/switch_vlans/defaults/main.yml similarity index 100% rename from roles/switch-vlans/defaults/main.yml rename to roles/switch_vlans/defaults/main.yml diff --git a/roles/switch-vlans/tasks/main.yml b/roles/switch_vlans/tasks/main.yml similarity index 100% rename from roles/switch-vlans/tasks/main.yml rename to roles/switch_vlans/tasks/main.yml diff --git a/roles/switch-vlans/vars/main.yml b/roles/switch_vlans/vars/main.yml similarity index 100% rename from roles/switch-vlans/vars/main.yml rename to roles/switch_vlans/vars/main.yml diff --git a/roles/tls-everywhere/defaults/main.yml b/roles/tls_everywhere/defaults/main.yml similarity index 100% rename from roles/tls-everywhere/defaults/main.yml rename to roles/tls_everywhere/defaults/main.yml diff --git a/roles/tls-everywhere/handlers/main.yml b/roles/tls_everywhere/handlers/main.yml similarity index 100% rename from roles/tls-everywhere/handlers/main.yml rename to roles/tls_everywhere/handlers/main.yml diff --git a/roles/tls-everywhere/tasks/common.yaml b/roles/tls_everywhere/tasks/common.yaml similarity index 100% rename from roles/tls-everywhere/tasks/common.yaml rename to roles/tls_everywhere/tasks/common.yaml diff --git a/roles/tls-everywhere/tasks/overcloud-post-deployment.yaml b/roles/tls_everywhere/tasks/overcloud-post-deployment.yaml similarity index 100% rename from roles/tls-everywhere/tasks/overcloud-post-deployment.yaml rename to roles/tls_everywhere/tasks/overcloud-post-deployment.yaml diff --git a/roles/tls-everywhere/tasks/pre-deployment-containerized.yaml b/roles/tls_everywhere/tasks/pre-deployment-containerized.yaml similarity index 100% rename from roles/tls-everywhere/tasks/pre-deployment-containerized.yaml rename to roles/tls_everywhere/tasks/pre-deployment-containerized.yaml diff --git a/roles/tls-everywhere/tasks/pre-deployment-non-containerized.yaml b/roles/tls_everywhere/tasks/pre-deployment-non-containerized.yaml similarity index 100% rename from roles/tls-everywhere/tasks/pre-deployment-non-containerized.yaml rename to roles/tls_everywhere/tasks/pre-deployment-non-containerized.yaml diff --git a/roles/tls-everywhere/tasks/pre-deployment.yaml b/roles/tls_everywhere/tasks/pre-deployment.yaml similarity index 100% rename from roles/tls-everywhere/tasks/pre-deployment.yaml rename to roles/tls_everywhere/tasks/pre-deployment.yaml diff --git a/roles/tls-everywhere/tasks/prep.yaml b/roles/tls_everywhere/tasks/prep.yaml similarity index 100% rename from roles/tls-everywhere/tasks/prep.yaml rename to roles/tls_everywhere/tasks/prep.yaml diff --git a/roles/tls-everywhere/vars/main.yml b/roles/tls_everywhere/vars/main.yml similarity index 100% rename from roles/tls-everywhere/vars/main.yml rename to roles/tls_everywhere/vars/main.yml diff --git a/roles/undercloud-cpu/README.md b/roles/undercloud_cpu/README.md similarity index 100% rename from roles/undercloud-cpu/README.md rename to roles/undercloud_cpu/README.md diff --git a/roles/undercloud-cpu/defaults/main.yml b/roles/undercloud_cpu/defaults/main.yml similarity index 100% rename from roles/undercloud-cpu/defaults/main.yml rename to roles/undercloud_cpu/defaults/main.yml diff --git a/roles/undercloud-cpu/molecule/default/Dockerfile.j2 b/roles/undercloud_cpu/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-cpu/molecule/default/Dockerfile.j2 rename to roles/undercloud_cpu/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-cpu/molecule/default/molecule.yml b/roles/undercloud_cpu/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-cpu/molecule/default/molecule.yml rename to roles/undercloud_cpu/molecule/default/molecule.yml diff --git a/roles/undercloud-cpu/molecule/default/playbook.yml b/roles/undercloud_cpu/molecule/default/playbook.yml similarity index 91% rename from roles/undercloud-cpu/molecule/default/playbook.yml rename to roles/undercloud_cpu/molecule/default/playbook.yml index b40f03afb..f6802bfe8 100644 --- a/roles/undercloud-cpu/molecule/default/playbook.yml +++ b/roles/undercloud_cpu/molecule/default/playbook.yml @@ -24,7 +24,7 @@ tasks: - block: - include_role: - name: undercloud-cpu + name: undercloud_cpu rescue: - name: Clear host errors meta: clear_host_errors @@ -38,5 +38,5 @@ - name: Fail the test fail: msg: | - The undercloud-cpu role should have detected that there is not + The undercloud_cpu role should have detected that there is not enough CPU diff --git a/roles/undercloud-cpu/tasks/main.yml b/roles/undercloud_cpu/tasks/main.yml similarity index 100% rename from roles/undercloud-cpu/tasks/main.yml rename to roles/undercloud_cpu/tasks/main.yml diff --git a/roles/undercloud-cpu/vars/main.yaml b/roles/undercloud_cpu/vars/main.yaml similarity index 100% rename from roles/undercloud-cpu/vars/main.yaml rename to roles/undercloud_cpu/vars/main.yaml diff --git a/roles/undercloud-debug/README.md b/roles/undercloud_debug/README.md similarity index 100% rename from roles/undercloud-debug/README.md rename to roles/undercloud_debug/README.md diff --git a/roles/undercloud-debug/defaults/main.yml b/roles/undercloud_debug/defaults/main.yml similarity index 100% rename from roles/undercloud-debug/defaults/main.yml rename to roles/undercloud_debug/defaults/main.yml diff --git a/roles/undercloud-debug/molecule/default/Dockerfile.j2 b/roles/undercloud_debug/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-debug/molecule/default/Dockerfile.j2 rename to roles/undercloud_debug/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-debug/molecule/default/molecule.yml b/roles/undercloud_debug/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-debug/molecule/default/molecule.yml rename to roles/undercloud_debug/molecule/default/molecule.yml diff --git a/roles/undercloud-debug/molecule/default/playbook.yml b/roles/undercloud_debug/molecule/default/playbook.yml similarity index 91% rename from roles/undercloud-debug/molecule/default/playbook.yml rename to roles/undercloud_debug/molecule/default/playbook.yml index 3b44fcbb7..cca7f2ea7 100644 --- a/roles/undercloud-debug/molecule/default/playbook.yml +++ b/roles/undercloud_debug/molecule/default/playbook.yml @@ -33,14 +33,14 @@ - name: Checking good value include_role: - name: undercloud-debug + name: undercloud_debug vars: debug_check: false - name: Should fail due to bad value block: - include_role: - name: undercloud-debug + name: undercloud_debug rescue: - name: Clear host errors @@ -55,4 +55,4 @@ - name: Fail the test fail: msg: | - The undercloud-debug should have detected a configuration issue + The undercloud_debug should have detected a configuration issue diff --git a/roles/undercloud-debug/tasks/main.yml b/roles/undercloud_debug/tasks/main.yml similarity index 100% rename from roles/undercloud-debug/tasks/main.yml rename to roles/undercloud_debug/tasks/main.yml diff --git a/roles/undercloud-debug/vars/main.yaml b/roles/undercloud_debug/vars/main.yaml similarity index 100% rename from roles/undercloud-debug/vars/main.yaml rename to roles/undercloud_debug/vars/main.yaml diff --git a/roles/undercloud-disk-space/README.md b/roles/undercloud_disk_space/README.md similarity index 100% rename from roles/undercloud-disk-space/README.md rename to roles/undercloud_disk_space/README.md diff --git a/roles/undercloud-disk-space/defaults/main.yml b/roles/undercloud_disk_space/defaults/main.yml similarity index 100% rename from roles/undercloud-disk-space/defaults/main.yml rename to roles/undercloud_disk_space/defaults/main.yml diff --git a/roles/undercloud-disk-space/molecule/default/Dockerfile.j2 b/roles/undercloud_disk_space/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-disk-space/molecule/default/Dockerfile.j2 rename to roles/undercloud_disk_space/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-disk-space/molecule/default/molecule.yml b/roles/undercloud_disk_space/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-disk-space/molecule/default/molecule.yml rename to roles/undercloud_disk_space/molecule/default/molecule.yml diff --git a/roles/undercloud-disk-space/molecule/default/playbook.yml b/roles/undercloud_disk_space/molecule/default/playbook.yml similarity index 96% rename from roles/undercloud-disk-space/molecule/default/playbook.yml rename to roles/undercloud_disk_space/molecule/default/playbook.yml index 0b5ae35d4..31826ae80 100644 --- a/roles/undercloud-disk-space/molecule/default/playbook.yml +++ b/roles/undercloud_disk_space/molecule/default/playbook.yml @@ -27,7 +27,7 @@ tasks: - block: - include_role: - name: undercloud-disk-space + name: undercloud_disk_space rescue: - name: Clear host errors meta: clear_host_errors diff --git a/roles/undercloud-disk-space/tasks/main.yml b/roles/undercloud_disk_space/tasks/main.yml similarity index 100% rename from roles/undercloud-disk-space/tasks/main.yml rename to roles/undercloud_disk_space/tasks/main.yml diff --git a/roles/undercloud-disk-space/vars/main.yaml b/roles/undercloud_disk_space/vars/main.yaml similarity index 100% rename from roles/undercloud-disk-space/vars/main.yaml rename to roles/undercloud_disk_space/vars/main.yaml diff --git a/roles/undercloud-heat-purge-deleted/README.md b/roles/undercloud_heat_purge_deleted/README.md similarity index 100% rename from roles/undercloud-heat-purge-deleted/README.md rename to roles/undercloud_heat_purge_deleted/README.md diff --git a/roles/undercloud-heat-purge-deleted/defaults/main.yml b/roles/undercloud_heat_purge_deleted/defaults/main.yml similarity index 100% rename from roles/undercloud-heat-purge-deleted/defaults/main.yml rename to roles/undercloud_heat_purge_deleted/defaults/main.yml diff --git a/roles/undercloud-heat-purge-deleted/molecule/default/Dockerfile.j2 b/roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-heat-purge-deleted/molecule/default/Dockerfile.j2 rename to roles/undercloud_heat_purge_deleted/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-heat-purge-deleted/molecule/default/molecule.yml b/roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-heat-purge-deleted/molecule/default/molecule.yml rename to roles/undercloud_heat_purge_deleted/molecule/default/molecule.yml diff --git a/roles/undercloud-heat-purge-deleted/molecule/default/playbook.yml b/roles/undercloud_heat_purge_deleted/molecule/default/playbook.yml similarity index 89% rename from roles/undercloud-heat-purge-deleted/molecule/default/playbook.yml rename to roles/undercloud_heat_purge_deleted/molecule/default/playbook.yml index c9618ee8f..c934266e2 100644 --- a/roles/undercloud-heat-purge-deleted/molecule/default/playbook.yml +++ b/roles/undercloud_heat_purge_deleted/molecule/default/playbook.yml @@ -22,7 +22,7 @@ tasks: - name: working detection include_role: - name: undercloud-heat-purge-deleted + name: undercloud_heat_purge_deleted - name: Validate failure block: @@ -35,7 +35,7 @@ - name: run validation include_role: - name: undercloud-heat-purge-deleted + name: undercloud_heat_purge_deleted rescue: - name: Clear host errors meta: clear_host_errors @@ -50,5 +50,5 @@ - name: Fail the validation at this point fail: msg: | - The undercloud-heat-purge-deleted validation failed to detect + The undercloud_heat_purge_deleted validation failed to detect missing cron job. diff --git a/roles/undercloud-heat-purge-deleted/molecule/default/prepare.yml b/roles/undercloud_heat_purge_deleted/molecule/default/prepare.yml similarity index 100% rename from roles/undercloud-heat-purge-deleted/molecule/default/prepare.yml rename to roles/undercloud_heat_purge_deleted/molecule/default/prepare.yml diff --git a/roles/undercloud-heat-purge-deleted/tasks/main.yml b/roles/undercloud_heat_purge_deleted/tasks/main.yml similarity index 100% rename from roles/undercloud-heat-purge-deleted/tasks/main.yml rename to roles/undercloud_heat_purge_deleted/tasks/main.yml diff --git a/roles/undercloud-heat-purge-deleted/vars/main.yaml b/roles/undercloud_heat_purge_deleted/vars/main.yaml similarity index 100% rename from roles/undercloud-heat-purge-deleted/vars/main.yaml rename to roles/undercloud_heat_purge_deleted/vars/main.yaml diff --git a/roles/undercloud-process-count/README.md b/roles/undercloud_process_count/README.md similarity index 100% rename from roles/undercloud-process-count/README.md rename to roles/undercloud_process_count/README.md diff --git a/roles/undercloud-process-count/defaults/main.yml b/roles/undercloud_process_count/defaults/main.yml similarity index 100% rename from roles/undercloud-process-count/defaults/main.yml rename to roles/undercloud_process_count/defaults/main.yml diff --git a/roles/undercloud-process-count/tasks/main.yml b/roles/undercloud_process_count/tasks/main.yml similarity index 100% rename from roles/undercloud-process-count/tasks/main.yml rename to roles/undercloud_process_count/tasks/main.yml diff --git a/roles/undercloud-process-count/vars/main.yaml b/roles/undercloud_process_count/vars/main.yaml similarity index 100% rename from roles/undercloud-process-count/vars/main.yaml rename to roles/undercloud_process_count/vars/main.yaml diff --git a/roles/undercloud-ram/README.md b/roles/undercloud_ram/README.md similarity index 100% rename from roles/undercloud-ram/README.md rename to roles/undercloud_ram/README.md diff --git a/roles/undercloud-ram/defaults/main.yml b/roles/undercloud_ram/defaults/main.yml similarity index 100% rename from roles/undercloud-ram/defaults/main.yml rename to roles/undercloud_ram/defaults/main.yml diff --git a/roles/undercloud-ram/molecule/default/Dockerfile.j2 b/roles/undercloud_ram/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-ram/molecule/default/Dockerfile.j2 rename to roles/undercloud_ram/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-ram/molecule/default/molecule.yml b/roles/undercloud_ram/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-ram/molecule/default/molecule.yml rename to roles/undercloud_ram/molecule/default/molecule.yml diff --git a/roles/undercloud-ram/molecule/default/playbook.yml b/roles/undercloud_ram/molecule/default/playbook.yml similarity index 91% rename from roles/undercloud-ram/molecule/default/playbook.yml rename to roles/undercloud_ram/molecule/default/playbook.yml index 2e044c17a..22e52b994 100644 --- a/roles/undercloud-ram/molecule/default/playbook.yml +++ b/roles/undercloud_ram/molecule/default/playbook.yml @@ -24,7 +24,7 @@ tasks: - block: - include_role: - name: undercloud-ram + name: undercloud_ram rescue: - name: Clear host errors meta: clear_host_errors @@ -38,5 +38,5 @@ - name: Fail the test fail: msg: | - The undercloud-ram role should have detected that there is not + The undercloud_ram role should have detected that there is not enough RAM diff --git a/roles/undercloud-ram/tasks/main.yml b/roles/undercloud_ram/tasks/main.yml similarity index 100% rename from roles/undercloud-ram/tasks/main.yml rename to roles/undercloud_ram/tasks/main.yml diff --git a/roles/undercloud-ram/vars/main.yaml b/roles/undercloud_ram/vars/main.yaml similarity index 100% rename from roles/undercloud-ram/vars/main.yaml rename to roles/undercloud_ram/vars/main.yaml diff --git a/roles/undercloud-selinux-mode/README.md b/roles/undercloud_selinux_mode/README.md similarity index 100% rename from roles/undercloud-selinux-mode/README.md rename to roles/undercloud_selinux_mode/README.md diff --git a/roles/undercloud-selinux-mode/tasks/main.yml b/roles/undercloud_selinux_mode/tasks/main.yml similarity index 100% rename from roles/undercloud-selinux-mode/tasks/main.yml rename to roles/undercloud_selinux_mode/tasks/main.yml diff --git a/roles/undercloud-selinux-mode/vars/main.yml b/roles/undercloud_selinux_mode/vars/main.yml similarity index 100% rename from roles/undercloud-selinux-mode/vars/main.yml rename to roles/undercloud_selinux_mode/vars/main.yml diff --git a/roles/undercloud-service-status/README.md b/roles/undercloud_service_status/README.md similarity index 100% rename from roles/undercloud-service-status/README.md rename to roles/undercloud_service_status/README.md diff --git a/roles/undercloud-service-status/defaults/main.yml b/roles/undercloud_service_status/defaults/main.yml similarity index 100% rename from roles/undercloud-service-status/defaults/main.yml rename to roles/undercloud_service_status/defaults/main.yml diff --git a/roles/undercloud-service-status/tasks/main.yml b/roles/undercloud_service_status/tasks/main.yml similarity index 100% rename from roles/undercloud-service-status/tasks/main.yml rename to roles/undercloud_service_status/tasks/main.yml diff --git a/roles/undercloud-service-status/vars/main.yaml b/roles/undercloud_service_status/vars/main.yaml similarity index 100% rename from roles/undercloud-service-status/vars/main.yaml rename to roles/undercloud_service_status/vars/main.yaml diff --git a/roles/undercloud-tokenflush/README.md b/roles/undercloud_tokenflush/README.md similarity index 100% rename from roles/undercloud-tokenflush/README.md rename to roles/undercloud_tokenflush/README.md diff --git a/roles/undercloud-tokenflush/defaults/main.yml b/roles/undercloud_tokenflush/defaults/main.yml similarity index 100% rename from roles/undercloud-tokenflush/defaults/main.yml rename to roles/undercloud_tokenflush/defaults/main.yml diff --git a/roles/undercloud-tokenflush/molecule/default/Dockerfile.j2 b/roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/undercloud-tokenflush/molecule/default/Dockerfile.j2 rename to roles/undercloud_tokenflush/molecule/default/Dockerfile.j2 diff --git a/roles/undercloud-tokenflush/molecule/default/molecule.yml b/roles/undercloud_tokenflush/molecule/default/molecule.yml similarity index 100% rename from roles/undercloud-tokenflush/molecule/default/molecule.yml rename to roles/undercloud_tokenflush/molecule/default/molecule.yml diff --git a/roles/undercloud-tokenflush/molecule/default/playbook.yml b/roles/undercloud_tokenflush/molecule/default/playbook.yml similarity index 90% rename from roles/undercloud-tokenflush/molecule/default/playbook.yml rename to roles/undercloud_tokenflush/molecule/default/playbook.yml index ec49612f9..b7a1e5f0c 100644 --- a/roles/undercloud-tokenflush/molecule/default/playbook.yml +++ b/roles/undercloud_tokenflush/molecule/default/playbook.yml @@ -22,7 +22,7 @@ tasks: - name: working detection include_role: - name: undercloud-tokenflush + name: undercloud_tokenflush - name: Validate failure block: @@ -35,7 +35,7 @@ - name: run validation include_role: - name: undercloud-tokenflush + name: undercloud_tokenflush rescue: - name: Clear host errors meta: clear_host_errors @@ -50,5 +50,5 @@ - name: Fail the validation at this point fail: msg: | - The undercloud-tokenflush validation failed to detect + The undercloud_tokenflush validation failed to detect missing cron job. diff --git a/roles/undercloud-tokenflush/molecule/default/prepare.yml b/roles/undercloud_tokenflush/molecule/default/prepare.yml similarity index 100% rename from roles/undercloud-tokenflush/molecule/default/prepare.yml rename to roles/undercloud_tokenflush/molecule/default/prepare.yml diff --git a/roles/undercloud-tokenflush/tasks/main.yml b/roles/undercloud_tokenflush/tasks/main.yml similarity index 100% rename from roles/undercloud-tokenflush/tasks/main.yml rename to roles/undercloud_tokenflush/tasks/main.yml diff --git a/roles/undercloud-tokenflush/vars/main.yaml b/roles/undercloud_tokenflush/vars/main.yaml similarity index 100% rename from roles/undercloud-tokenflush/vars/main.yaml rename to roles/undercloud_tokenflush/vars/main.yaml diff --git a/roles/validate-selinux/defaults/main.yml b/roles/validate_selinux/defaults/main.yml similarity index 100% rename from roles/validate-selinux/defaults/main.yml rename to roles/validate_selinux/defaults/main.yml diff --git a/roles/validate-selinux/handlers/main.yml b/roles/validate_selinux/handlers/main.yml similarity index 100% rename from roles/validate-selinux/handlers/main.yml rename to roles/validate_selinux/handlers/main.yml diff --git a/roles/validate-selinux/molecule/default/Dockerfile b/roles/validate_selinux/molecule/default/Dockerfile similarity index 100% rename from roles/validate-selinux/molecule/default/Dockerfile rename to roles/validate_selinux/molecule/default/Dockerfile diff --git a/roles/validate-selinux/molecule/default/molecule.yml b/roles/validate_selinux/molecule/default/molecule.yml similarity index 100% rename from roles/validate-selinux/molecule/default/molecule.yml rename to roles/validate_selinux/molecule/default/molecule.yml diff --git a/roles/validate-selinux/molecule/default/playbook.yml b/roles/validate_selinux/molecule/default/playbook.yml similarity index 95% rename from roles/validate-selinux/molecule/default/playbook.yml rename to roles/validate_selinux/molecule/default/playbook.yml index c08819a59..00c31d70e 100644 --- a/roles/validate-selinux/molecule/default/playbook.yml +++ b/roles/validate_selinux/molecule/default/playbook.yml @@ -24,13 +24,13 @@ tasks: - name: Simple run without filter against clean auditlog include_role: - name: validate-selinux + name: validate_selinux vars: validate_selinux_audit_source: '/var/log/audit-clean.log' - name: Run with filter against unclean auditlog include_role: - name: validate-selinux + name: validate_selinux vars: validate_selinux_audit_source: '/var/log/audit-unclean.log' validate_selinux_skip_list: @@ -43,7 +43,7 @@ block: - name: Run role include_role: - name: validate-selinux + name: validate_selinux vars: validate_selinux_audit_source: '/var/log/audit-unclean.log' validate_selinux_strict: true diff --git a/roles/validate-selinux/molecule/default/prepare.yml b/roles/validate_selinux/molecule/default/prepare.yml similarity index 100% rename from roles/validate-selinux/molecule/default/prepare.yml rename to roles/validate_selinux/molecule/default/prepare.yml diff --git a/roles/validate-selinux/molecule/default/verify.yml b/roles/validate_selinux/molecule/default/verify.yml similarity index 100% rename from roles/validate-selinux/molecule/default/verify.yml rename to roles/validate_selinux/molecule/default/verify.yml diff --git a/roles/validate-selinux/tasks/main.yml b/roles/validate_selinux/tasks/main.yml similarity index 100% rename from roles/validate-selinux/tasks/main.yml rename to roles/validate_selinux/tasks/main.yml diff --git a/roles/validate-selinux/templates/skip-list.j2 b/roles/validate_selinux/templates/skip-list.j2 similarity index 100% rename from roles/validate-selinux/templates/skip-list.j2 rename to roles/validate_selinux/templates/skip-list.j2 diff --git a/roles/validate-selinux/vars/main.yml b/roles/validate_selinux/vars/main.yml similarity index 98% rename from roles/validate-selinux/vars/main.yml rename to roles/validate_selinux/vars/main.yml index 0a9e924d4..d826fe191 100644 --- a/roles/validate-selinux/vars/main.yml +++ b/roles/validate_selinux/vars/main.yml @@ -19,4 +19,4 @@ # vars, items within this path are considered part of the role and not # intended to be modified. -# All variables within this role should have a prefix of "validate-selinux" +# All variables within this role should have a prefix of "validate_selinux" diff --git a/roles/xfs-check-ftype/molecule/default/Dockerfile.j2 b/roles/xfs_check_ftype/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/xfs-check-ftype/molecule/default/Dockerfile.j2 rename to roles/xfs_check_ftype/molecule/default/Dockerfile.j2 diff --git a/roles/xfs-check-ftype/molecule/default/molecule.yml b/roles/xfs_check_ftype/molecule/default/molecule.yml similarity index 100% rename from roles/xfs-check-ftype/molecule/default/molecule.yml rename to roles/xfs_check_ftype/molecule/default/molecule.yml diff --git a/roles/xfs-check-ftype/molecule/default/playbook.yml b/roles/xfs_check_ftype/molecule/default/playbook.yml similarity index 95% rename from roles/xfs-check-ftype/molecule/default/playbook.yml rename to roles/xfs_check_ftype/molecule/default/playbook.yml index b1a1c5b2c..4c7f8536e 100644 --- a/roles/xfs-check-ftype/molecule/default/playbook.yml +++ b/roles/xfs_check_ftype/molecule/default/playbook.yml @@ -18,4 +18,4 @@ - name: Converge hosts: all roles: - - role: "xfs-check-ftype" + - role: xfs_check_ftype diff --git a/roles/xfs-check-ftype/molecule/default/prepare.yml b/roles/xfs_check_ftype/molecule/default/prepare.yml similarity index 100% rename from roles/xfs-check-ftype/molecule/default/prepare.yml rename to roles/xfs_check_ftype/molecule/default/prepare.yml diff --git a/roles/xfs-check-ftype/molecule/default/verify.yml b/roles/xfs_check_ftype/molecule/default/verify.yml similarity index 100% rename from roles/xfs-check-ftype/molecule/default/verify.yml rename to roles/xfs_check_ftype/molecule/default/verify.yml diff --git a/roles/xfs-check-ftype/tasks/main.yml b/roles/xfs_check_ftype/tasks/main.yml similarity index 100% rename from roles/xfs-check-ftype/tasks/main.yml rename to roles/xfs_check_ftype/tasks/main.yml diff --git a/roles/xfs-check-ftype/vars/main.yml b/roles/xfs_check_ftype/vars/main.yml similarity index 100% rename from roles/xfs-check-ftype/vars/main.yml rename to roles/xfs_check_ftype/vars/main.yml diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index 72f7b94bb..23be748bc 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -2,76 +2,74 @@ - project-template: check: jobs: - - tripleo-validations-centos-7-molecule-controller-token - - tripleo-validations-centos-7-molecule-controller-ulimits - - tripleo-validations-centos-7-molecule-ctlplane-ip-range + - tripleo-validations-centos-7-molecule-controller_token + - tripleo-validations-centos-7-molecule-controller_ulimits + - tripleo-validations-centos-7-molecule-ctlplane_ip_range - tripleo-validations-centos-7-molecule-dns - tripleo-validations-centos-7-molecule-haproxy - tripleo-validations-centos-7-molecule-repos - - tripleo-validations-centos-7-molecule-undercloud-cpu - - tripleo-validations-centos-7-molecule-undercloud-ram - - tripleo-validations-centos-7-molecule-undercloud-debug - - tripleo-validations-centos-7-molecule-undercloud-disk-space - - tripleo-validations-centos-7-molecule-xfs-check-ftype - - tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver - - tripleo-validations-centos-7-molecule-nova-status - - tripleo-validations-centos-7-molecule-image-serve - - tripleo-validations-centos-7-molecule-check-network-gateway - - tripleo-validations-centos-7-molecule-undercloud-heat-purge-deleted - - tripleo-validations-centos-7-molecule-undercloud-tokenflush - - tripleo-validations-centos-7-molecule-rabbitmq-limits - - tripleo-validations-centos-7-molecule-stonith-exists - - tripleo-validations-centos-7-molecule-check-latest-packages-version - - tripleo-validations-centos-7-molecule-validate-selinux + - tripleo-validations-centos-7-molecule-undercloud_cpu + - tripleo-validations-centos-7-molecule-undercloud_ram + - tripleo-validations-centos-7-molecule-undercloud_debug + - tripleo-validations-centos-7-molecule-undercloud_disk_space + - tripleo-validations-centos-7-molecule-xfs_check_ftype + - tripleo-validations-centos-7-molecule-no_op_firewall_nova_driver + - tripleo-validations-centos-7-molecule-nova_status + - tripleo-validations-centos-7-molecule-image_serve + - tripleo-validations-centos-7-molecule-check_network_gateway + - tripleo-validations-centos-7-molecule-undercloud_heat_purge_deleted + - tripleo-validations-centos-7-molecule-undercloud_tokenflush + - tripleo-validations-centos-7-molecule-rabbitmq_limits + - tripleo-validations-centos-7-molecule-stonith_exists + - tripleo-validations-centos-7-molecule-check_latest_packages_version + - tripleo-validations-centos-7-molecule-validate_selinux - tripleo-validations-centos-7-molecule-ceph - queue: integrated gate: jobs: - - tripleo-validations-centos-7-molecule-controller-token - - tripleo-validations-centos-7-molecule-controller-ulimits - - tripleo-validations-centos-7-molecule-ctlplane-ip-range + - tripleo-validations-centos-7-molecule-controller_token + - tripleo-validations-centos-7-molecule-controller_ulimits + - tripleo-validations-centos-7-molecule-ctlplane_ip_range - tripleo-validations-centos-7-molecule-dns - tripleo-validations-centos-7-molecule-haproxy - tripleo-validations-centos-7-molecule-repos - - tripleo-validations-centos-7-molecule-undercloud-cpu - - tripleo-validations-centos-7-molecule-undercloud-ram - - tripleo-validations-centos-7-molecule-undercloud-debug - - tripleo-validations-centos-7-molecule-undercloud-disk-space - - tripleo-validations-centos-7-molecule-xfs-check-ftype - - tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver - - tripleo-validations-centos-7-molecule-nova-status - - tripleo-validations-centos-7-molecule-image-serve - - tripleo-validations-centos-7-molecule-check-network-gateway - - tripleo-validations-centos-7-molecule-undercloud-heat-purge-deleted - - tripleo-validations-centos-7-molecule-undercloud-tokenflush - - tripleo-validations-centos-7-molecule-rabbitmq-limits - - tripleo-validations-centos-7-molecule-stonith-exists - - tripleo-validations-centos-7-molecule-check-latest-packages-version - - tripleo-validations-centos-7-molecule-validate-selinux + - tripleo-validations-centos-7-molecule-undercloud_cpu + - tripleo-validations-centos-7-molecule-undercloud_ram + - tripleo-validations-centos-7-molecule-undercloud_debug + - tripleo-validations-centos-7-molecule-undercloud_disk_space + - tripleo-validations-centos-7-molecule-xfs_check_ftype + - tripleo-validations-centos-7-molecule-no_op_firewall_nova_driver + - tripleo-validations-centos-7-molecule-nova_status + - tripleo-validations-centos-7-molecule-image_serve + - tripleo-validations-centos-7-molecule-check_network_gateway + - tripleo-validations-centos-7-molecule-undercloud_heat_purge_deleted + - tripleo-validations-centos-7-molecule-undercloud_tokenflush + - tripleo-validations-centos-7-molecule-rabbitmq_limits + - tripleo-validations-centos-7-molecule-stonith_exists + - tripleo-validations-centos-7-molecule-check_latest_packages_version + - tripleo-validations-centos-7-molecule-validate_selinux - tripleo-validations-centos-7-molecule-ceph - queue: integrated name: tripleo-validations-molecule-jobs - job: files: - - ^roles/controller-token/.* - name: tripleo-validations-centos-7-molecule-controller-token + - ^roles/controller_token/.* + name: tripleo-validations-centos-7-molecule-controller_token parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: controller-token + tripleo_validations_role_name: controller_token - job: files: - - ^roles/controller-ulimits/.* - name: tripleo-validations-centos-7-molecule-controller-ulimits + - ^roles/controller_ulimits/.* + name: tripleo-validations-centos-7-molecule-controller_ulimits parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: controller-ulimits + tripleo_validations_role_name: controller_ulimits - job: files: - - ^roles/ctlplane-ip-range/.* - name: tripleo-validations-centos-7-molecule-ctlplane-ip-range + - ^roles/ctlplane_ip_range/.* + name: tripleo-validations-centos-7-molecule-ctlplane_ip_range parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: ctlplane-ip-range + tripleo_validations_role_name: ctlplane_ip_range - job: files: - ^roles/dns/.* @@ -95,110 +93,110 @@ tripleo_validations_role_name: repos - job: files: - - ^roles/undercloud-cpu/.* - name: tripleo-validations-centos-7-molecule-undercloud-cpu + - ^roles/undercloud_cpu/.* + name: tripleo-validations-centos-7-molecule-undercloud_cpu parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-cpu + tripleo_validations_role_name: undercloud_cpu - job: files: - - ^roles/undercloud-ram/.* - name: tripleo-validations-centos-7-molecule-undercloud-ram + - ^roles/undercloud_ram/.* + name: tripleo-validations-centos-7-molecule-undercloud_ram parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-ram + tripleo_validations_role_name: undercloud_ram - job: files: - - ^roles/undercloud-debug/.* - name: tripleo-validations-centos-7-molecule-undercloud-debug + - ^roles/undercloud_debug/.* + name: tripleo-validations-centos-7-molecule-undercloud_debug parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-debug + tripleo_validations_role_name: undercloud_debug - job: files: - - ^roles/undercloud-disk-space/.* - name: tripleo-validations-centos-7-molecule-undercloud-disk-space + - ^roles/undercloud_disk_space/.* + name: tripleo-validations-centos-7-molecule-undercloud_disk_space parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-disk-space + tripleo_validations_role_name: undercloud_disk_space - job: files: - - ^roles/xfs-check-ftype/.* - name: tripleo-validations-centos-7-molecule-xfs-check-ftype + - ^roles/xfs_check_ftype/.* + name: tripleo-validations-centos-7-molecule-xfs_check_ftype parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: xfs-check-ftype + tripleo_validations_role_name: xfs_check_ftype voting: false - job: files: - - ^roles/no-op-firewall-nova-driver/.* - name: tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver + - ^roles/no_op_firewall_nova_driver/.* + name: tripleo-validations-centos-7-molecule-no_op_firewall_nova_driver parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: no-op-firewall-nova-driver + tripleo_validations_role_name: no_op_firewall_nova_driver - job: files: - - ^roles/nova-status/.* - name: tripleo-validations-centos-7-molecule-nova-status + - ^roles/nova_status/.* + name: tripleo-validations-centos-7-molecule-nova_status parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: nova-status + tripleo_validations_role_name: nova_status - job: files: - - ^roles/image-serve/.* - name: tripleo-validations-centos-7-molecule-image-serve + - ^roles/image_serve/.* + name: tripleo-validations-centos-7-molecule-image_serve parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: image-serve + tripleo_validations_role_name: image_serve - job: files: - - ^roles/check-network-gateway/.* - name: tripleo-validations-centos-7-molecule-check-network-gateway + - ^roles/check_network_gateway/.* + name: tripleo-validations-centos-7-molecule-check_network_gateway parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: check-network-gateway + tripleo_validations_role_name: check_network_gateway - job: files: - - ^roles/undercloud-heat-purge-deleted/.* - name: tripleo-validations-centos-7-molecule-undercloud-heat-purge-deleted + - ^roles/undercloud_heat_purge_deleted/.* + name: tripleo-validations-centos-7-molecule-undercloud_heat_purge_deleted parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-heat-purge-deleted + tripleo_validations_role_name: undercloud_heat_purge_deleted - job: files: - - ^roles/undercloud-tokenflush/.* - name: tripleo-validations-centos-7-molecule-undercloud-tokenflush + - ^roles/undercloud_tokenflush/.* + name: tripleo-validations-centos-7-molecule-undercloud_tokenflush parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: undercloud-tokenflush + tripleo_validations_role_name: undercloud_tokenflush - job: files: - - ^roles/rabbitmq-limits/.* - name: tripleo-validations-centos-7-molecule-rabbitmq-limits + - ^roles/rabbitmq_limits/.* + name: tripleo-validations-centos-7-molecule-rabbitmq_limits parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: rabbitmq-limits + tripleo_validations_role_name: rabbitmq_limits - job: files: - - ^roles/stonith-exists/.* - name: tripleo-validations-centos-7-molecule-stonith-exists + - ^roles/stonith_exists/.* + name: tripleo-validations-centos-7-molecule-stonith_exists parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: stonith-exists + tripleo_validations_role_name: stonith_exists - job: files: - - ^roles/check-latest-packages-version/.* - name: tripleo-validations-centos-7-molecule-check-latest-packages-version + - ^roles/check_latest_packages_version/.* + name: tripleo-validations-centos-7-molecule-check_latest_packages_version parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: check-latest-packages-version + tripleo_validations_role_name: check_latest_packages_version - job: files: - - ^roles/validate-selinux/.* - name: tripleo-validations-centos-7-molecule-validate-selinux + - ^roles/validate_selinux/.* + name: tripleo-validations-centos-7-molecule-validate_selinux parent: tripleo-validations-centos-7-base vars: - tripleo_validations_role_name: validate-selinux + tripleo_validations_role_name: validate_selinux - job: files: - ^roles/ceph/.*