From 6908722cfc9bdd81f34a91d12863d79d0a0130a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Didenko Date: Wed, 6 Apr 2016 17:13:55 +0200 Subject: [PATCH] Switch from RUN: to ROLE: annotation * RUN annotation caused duplication for tasks in the old folder * RUN should only be used if you need non-standard run configuration * With ROLE annotation there's no need to update all the tests when you add new astute.yaml fixture for existing role * Fix manifest variable in broken tests Change-Id: I7a1c98bdb51590d8d80cee387de35d5581cf1da2 Partial-bug: #1535339 --- tests/noop/spec/hosts/aodh/aodh_spec.rb | 10 ++---- tests/noop/spec/hosts/aodh/db_spec.rb | 9 +---- tests/noop/spec/hosts/aodh/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/apache/apache_spec.rb | 10 ++---- .../spec/hosts/api-proxy/api-proxy_spec.rb | 10 ++---- .../astute/dump_rabbitmq_definitions_spec.rb | 10 ++---- .../hosts/astute/service_token_off_spec.rb | 10 ++---- .../spec/hosts/ceilometer/compute_spec.rb | 6 ++-- .../spec/hosts/ceilometer/controller_spec.rb | 10 ++---- .../spec/hosts/ceilometer/keystone_spec.rb | 9 +---- .../hosts/ceilometer/radosgw_user_spec.rb | 10 ++---- tests/noop/spec/hosts/ceph/ceph-osd_spec.rb | 14 +------- .../noop/spec/hosts/ceph/ceph_compute_spec.rb | 8 +---- tests/noop/spec/hosts/ceph/ceph_pools_spec.rb | 10 ++---- .../noop/spec/hosts/ceph/enable_rados_spec.rb | 10 ++---- tests/noop/spec/hosts/ceph/mon_spec.rb | 14 ++------ .../spec/hosts/ceph/radosgw_keystone_spec.rb | 9 +---- tests/noop/spec/hosts/ceph/radosgw_spec.rb | 13 ++------ tests/noop/spec/hosts/ceph/updatedb_spec.rb | 16 ++------- tests/noop/spec/hosts/cgroups/cgroups_spec.rb | 33 ++++++++----------- .../cluster-haproxy/cluster-haproxy_spec.rb | 10 ++---- .../cluster-vrouter/cluster-vrouter_spec.rb | 10 ++---- tests/noop/spec/hosts/cluster/cluster_spec.rb | 10 ++---- tests/noop/spec/hosts/cluster/health_spec.rb | 10 ++---- .../noop/spec/hosts/database/database_spec.rb | 10 ++---- tests/noop/spec/hosts/dns/dns-client_spec.rb | 28 +++++----------- tests/noop/spec/hosts/dns/dns-server_spec.rb | 10 ++---- .../noop/spec/hosts/firewall/firewall_spec.rb | 30 ++++++----------- .../spec/hosts/fuel_pkgs/fuel_pkgs_spec.rb | 30 ++++++----------- .../fuel_pkgs/setup_repositories_spec.rb | 33 ++++++++----------- .../hosts/generate_vms/generate_vms_spec.rb | 2 +- tests/noop/spec/hosts/glance/db_spec.rb | 9 +---- tests/noop/spec/hosts/glance/glance_spec.rb | 10 ++---- tests/noop/spec/hosts/glance/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/globals/globals_spec.rb | 11 +++++++ tests/noop/spec/hosts/heat/db_spec.rb | 9 +---- tests/noop/spec/hosts/heat/heat_spec.rb | 10 ++---- tests/noop/spec/hosts/heat/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/hiera/hiera_spec.rb | 33 ++++++++----------- .../hiera/override_configuration_spec.rb | 33 ++++++++----------- tests/noop/spec/hosts/horizon/horizon_spec.rb | 10 ++---- tests/noop/spec/hosts/hosts/hosts_spec.rb | 33 ++++++++----------- tests/noop/spec/hosts/ironic/db_spec.rb | 9 +---- .../spec/hosts/ironic/ironic-compute_spec.rb | 13 ++------ tests/noop/spec/hosts/ironic/ironic_spec.rb | 12 ++----- tests/noop/spec/hosts/ironic/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/keystone/db_spec.rb | 9 +---- .../noop/spec/hosts/keystone/keystone_spec.rb | 10 ++---- .../spec/hosts/keystone/openrc_delete_spec.rb | 22 ++----------- .../keystone/workloads_collector_add_spec.rb | 9 +---- .../workloads_collector_remove_spec.rb | 12 +++---- tests/noop/spec/hosts/logging/logging_spec.rb | 31 +++++++---------- .../spec/hosts/memcached/memcached_spec.rb | 10 ++---- tests/noop/spec/hosts/murano/cfapi_spec.rb | 10 ++---- tests/noop/spec/hosts/murano/db_spec.rb | 9 +---- .../spec/hosts/murano/keystone_cfapi_spec.rb | 9 +---- tests/noop/spec/hosts/murano/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/murano/murano_spec.rb | 12 ++----- tests/noop/spec/hosts/murano/rabbitmq_spec.rb | 12 ++----- .../netconfig/configure_default_route_spec.rb | 26 ++++----------- .../netconfig/connectivity_tests_spec.rb | 31 +++++++---------- .../spec/hosts/netconfig/netconfig_spec.rb | 31 +++++++---------- .../hosts/netconfig/reserved_ports_spec.rb | 31 +++++++---------- .../hosts/netconfig/sriov_iommu_check_spec.rb | 5 +-- tests/noop/spec/hosts/ntp/ntp-check_spec.rb | 10 ++---- tests/noop/spec/hosts/ntp/ntp-client_spec.rb | 25 ++++---------- tests/noop/spec/hosts/ntp/ntp-server_spec.rb | 10 ++---- tests/noop/spec/hosts/ntp/timesync_spec.rb | 21 +----------- .../create_cinder_types_spec.rb | 9 +---- .../spec/hosts/openstack-cinder/db_spec.rb | 9 +---- .../hosts/openstack-cinder/keystone_spec.rb | 9 +---- .../openstack-cinder/openstack-cinder_spec.rb | 10 ++---- .../hosts/openstack-controller/db_spec.rb | 9 +---- .../openstack-controller/keystone_spec.rb | 9 +---- .../openstack-controller_spec.rb | 10 ++---- .../openstack-haproxy-aodh_spec.rb | 13 ++------ .../openstack-haproxy-ceilometer_spec.rb | 10 ++---- .../openstack-haproxy-cinder_spec.rb | 10 ++---- .../openstack-haproxy-glance_spec.rb | 10 ++---- .../openstack-haproxy-heat_spec.rb | 10 ++---- .../openstack-haproxy-horizon_spec.rb | 10 ++---- .../openstack-haproxy-ironic_spec.rb | 10 ++---- .../openstack-haproxy-keystone_spec.rb | 10 ++---- .../openstack-haproxy-murano_spec.rb | 12 ++----- .../openstack-haproxy-mysqld_spec.rb | 10 ++---- .../openstack-haproxy-neutron_spec.rb | 10 ++---- .../openstack-haproxy-nova_spec.rb | 10 ++---- .../openstack-haproxy-radosgw_spec.rb | 10 ++---- .../openstack-haproxy-sahara_spec.rb | 10 ++---- .../openstack-haproxy-stats_spec.rb | 10 ++---- .../openstack-haproxy-swift_spec.rb | 10 ++---- .../openstack-haproxy_spec.rb | 10 ++---- .../openstack-network/agents/dhcp_spec.rb | 10 ++---- .../hosts/openstack-network/agents/l3_spec.rb | 15 ++------- .../openstack-network/agents/metadata_spec.rb | 15 ++------- .../openstack-network/agents/sriov_spec.rb | 5 +-- .../openstack-network/common-config_spec.rb | 15 ++------- .../openstack-network/compute-nova_spec.rb | 5 +-- .../spec/hosts/openstack-network/db_spec.rb | 9 +---- .../hosts/openstack-network/keystone_spec.rb | 9 +---- .../hosts/openstack-network/networks_spec.rb | 9 +---- .../openstack-network/plugins/ml2_spec.rb | 15 ++------- .../hosts/openstack-network/routers_spec.rb | 9 +---- .../openstack-network/server-config_spec.rb | 10 ++---- .../openstack-network/server-nova_spec.rb | 10 ++---- .../spec/hosts/plugins/plugins_rsync_spec.rb | 33 ++++++++----------- .../plugins_setup_repositories_spec.rb | 33 ++++++++----------- .../noop/spec/hosts/rabbitmq/rabbitmq_spec.rb | 10 ++---- .../hosts/roles/allocate_hugepages_spec.rb | 33 ++++++++----------- tests/noop/spec/hosts/roles/cinder_spec.rb | 5 +-- tests/noop/spec/hosts/roles/compute_spec.rb | 5 +-- .../noop/spec/hosts/roles/controller_spec.rb | 16 ++------- .../spec/hosts/roles/enable_cinder_spec.rb | 6 ++-- .../spec/hosts/roles/enable_compute_spec.rb | 6 ++-- .../spec/hosts/roles/ironic-conductor_spec.rb | 4 +-- tests/noop/spec/hosts/roles/mongo_spec.rb | 6 ++-- tests/noop/spec/hosts/sahara/db_spec.rb | 9 +---- tests/noop/spec/hosts/sahara/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/sahara/sahara_spec.rb | 10 ++---- .../hosts/ssl/ssl_add_trust_chain_spec.rb | 29 ++++++---------- .../noop/spec/hosts/ssl/ssl_dns_setup_spec.rb | 10 ++---- .../spec/hosts/ssl/ssl_keys_saving_spec.rb | 11 ++++++- tests/noop/spec/hosts/swift/keystone_spec.rb | 9 +---- tests/noop/spec/hosts/swift/proxy_spec.rb | 10 ++---- .../hosts/swift/rebalance_cronjob_spec.rb | 10 ++---- tests/noop/spec/hosts/swift/storage_spec.rb | 10 ++---- tests/noop/spec/hosts/swift/swift_spec.rb | 9 +---- tests/noop/spec/hosts/tools/tools_spec.rb | 31 +++++++---------- tests/noop/spec/hosts/umm/umm_spec.rb | 10 ++---- .../spec/hosts/virtual_ips/conntrackd_spec.rb | 10 ++---- .../hosts/virtual_ips/public_vip_ping_spec.rb | 10 ++---- .../hosts/virtual_ips/virtual_ips_spec.rb | 10 ++---- .../spec/hosts/vmware/cinder-vmware_spec.rb | 4 +-- .../spec/hosts/vmware/compute-vmware_spec.rb | 4 +-- tests/noop/spec/hosts/vmware/vcenter_spec.rb | 10 ++---- 135 files changed, 430 insertions(+), 1304 deletions(-) diff --git a/tests/noop/spec/hosts/aodh/aodh_spec.rb b/tests/noop/spec/hosts/aodh/aodh_spec.rb index ad1d462686..13f70777e6 100644 --- a/tests/noop/spec/hosts/aodh/aodh_spec.rb +++ b/tests/noop/spec/hosts/aodh/aodh_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/aodh/db_spec.rb b/tests/noop/spec/hosts/aodh/db_spec.rb index 9892f2fdd4..21784de3a1 100644 --- a/tests/noop/spec/hosts/aodh/db_spec.rb +++ b/tests/noop/spec/hosts/aodh/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/aodh/keystone_spec.rb b/tests/noop/spec/hosts/aodh/keystone_spec.rb index 87853d60b4..f2fee0baff 100644 --- a/tests/noop/spec/hosts/aodh/keystone_spec.rb +++ b/tests/noop/spec/hosts/aodh/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/apache/apache_spec.rb b/tests/noop/spec/hosts/apache/apache_spec.rb index 7dc30b4710..7d76bb7d34 100644 --- a/tests/noop/spec/hosts/apache/apache_spec.rb +++ b/tests/noop/spec/hosts/apache/apache_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb b/tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb index 690e05abf7..55806c9ead 100644 --- a/tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb +++ b/tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/astute/dump_rabbitmq_definitions_spec.rb b/tests/noop/spec/hosts/astute/dump_rabbitmq_definitions_spec.rb index 46f8c1d0d3..04015ab425 100644 --- a/tests/noop/spec/hosts/astute/dump_rabbitmq_definitions_spec.rb +++ b/tests/noop/spec/hosts/astute/dump_rabbitmq_definitions_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/astute/service_token_off_spec.rb b/tests/noop/spec/hosts/astute/service_token_off_spec.rb index fc3214c4d6..af0071250e 100644 --- a/tests/noop/spec/hosts/astute/service_token_off_spec.rb +++ b/tests/noop/spec/hosts/astute/service_token_off_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceilometer/compute_spec.rb b/tests/noop/spec/hosts/ceilometer/compute_spec.rb index ece3f50330..6082934a0e 100644 --- a/tests/noop/spec/hosts/ceilometer/compute_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/compute_spec.rb @@ -1,7 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute-vmware +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceilometer/controller_spec.rb b/tests/noop/spec/hosts/ceilometer/controller_spec.rb index c72b62b460..cb17fc920e 100644 --- a/tests/noop/spec/hosts/ceilometer/controller_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/controller_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceilometer/keystone_spec.rb b/tests/noop/spec/hosts/ceilometer/keystone_spec.rb index 4682f403fc..c7b4b78062 100644 --- a/tests/noop/spec/hosts/ceilometer/keystone_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceilometer/radosgw_user_spec.rb b/tests/noop/spec/hosts/ceilometer/radosgw_user_spec.rb index 0e9b466123..981d0bcdc4 100644 --- a/tests/noop/spec/hosts/ceilometer/radosgw_user_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/radosgw_user_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb b/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb index 83818c7496..35029cf97b 100644 --- a/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb +++ b/tests/noop/spec/hosts/ceph/ceph-osd_spec.rb @@ -1,16 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/ceph_compute_spec.rb b/tests/noop/spec/hosts/ceph/ceph_compute_spec.rb index 7fc96e351d..e9323416c8 100644 --- a/tests/noop/spec/hosts/ceph/ceph_compute_spec.rb +++ b/tests/noop/spec/hosts/ceph/ceph_compute_spec.rb @@ -1,10 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu -# SKIP_HIERA: neut_vlan.ceph.ceil-compute.overridden ubuntu FIXME -# SKIP_HIERA: neut_vlan.ceph.compute-ephemeral-ceph ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-compute ubuntu FIXME +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/ceph_pools_spec.rb b/tests/noop/spec/hosts/ceph/ceph_pools_spec.rb index 80c6fd6ecd..7995d1c530 100644 --- a/tests/noop/spec/hosts/ceph/ceph_pools_spec.rb +++ b/tests/noop/spec/hosts/ceph/ceph_pools_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/enable_rados_spec.rb b/tests/noop/spec/hosts/ceph/enable_rados_spec.rb index decd2fb389..bd850b3216 100644 --- a/tests/noop/spec/hosts/ceph/enable_rados_spec.rb +++ b/tests/noop/spec/hosts/ceph/enable_rados_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/mon_spec.rb b/tests/noop/spec/hosts/ceph/mon_spec.rb index 043e60ad9e..83857be622 100644 --- a/tests/noop/spec/hosts/ceph/mon_spec.rb +++ b/tests/noop/spec/hosts/ceph/mon_spec.rb @@ -1,15 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# SKIP_HIERA: neut_vlan.ceph.ceil-primary-controller ubuntu FIXME -# SKIP_HIERA: neut_vlan.ceph.controller-ephemeral-ceph ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-controller ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-primary-controller ubuntu FIXME +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/radosgw_keystone_spec.rb b/tests/noop/spec/hosts/ceph/radosgw_keystone_spec.rb index 6a9ab2d894..78f62eb0bc 100644 --- a/tests/noop/spec/hosts/ceph/radosgw_keystone_spec.rb +++ b/tests/noop/spec/hosts/ceph/radosgw_keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/radosgw_spec.rb b/tests/noop/spec/hosts/ceph/radosgw_spec.rb index 1a94f0964a..74e9df122b 100644 --- a/tests/noop/spec/hosts/ceph/radosgw_spec.rb +++ b/tests/noop/spec/hosts/ceph/radosgw_spec.rb @@ -1,14 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# SKIP_HIERA: neut_vlan.ceph.ceil-primary-controller ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-controller ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-primary-controller ubuntu FIXME +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ceph/updatedb_spec.rb b/tests/noop/spec/hosts/ceph/updatedb_spec.rb index 1a0db53c53..83b9285a23 100644 --- a/tests/noop/spec/hosts/ceph/updatedb_spec.rb +++ b/tests/noop/spec/hosts/ceph/updatedb_spec.rb @@ -1,16 +1,6 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: primary-controller +# ROLE: controller +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/cgroups/cgroups_spec.rb b/tests/noop/spec/hosts/cgroups/cgroups_spec.rb index 395ab24fa6..9bc9ae2e6d 100644 --- a/tests/noop/spec/hosts/cgroups/cgroups_spec.rb +++ b/tests/noop/spec/hosts/cgroups/cgroups_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'cgroups/cgroups.pp' diff --git a/tests/noop/spec/hosts/cluster-haproxy/cluster-haproxy_spec.rb b/tests/noop/spec/hosts/cluster-haproxy/cluster-haproxy_spec.rb index 0610ca0f80..69f2fa1faf 100644 --- a/tests/noop/spec/hosts/cluster-haproxy/cluster-haproxy_spec.rb +++ b/tests/noop/spec/hosts/cluster-haproxy/cluster-haproxy_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/cluster-vrouter/cluster-vrouter_spec.rb b/tests/noop/spec/hosts/cluster-vrouter/cluster-vrouter_spec.rb index 45251a49b5..a3d4a20474 100644 --- a/tests/noop/spec/hosts/cluster-vrouter/cluster-vrouter_spec.rb +++ b/tests/noop/spec/hosts/cluster-vrouter/cluster-vrouter_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/cluster/cluster_spec.rb b/tests/noop/spec/hosts/cluster/cluster_spec.rb index 0592a6feec..9ea3c19d94 100644 --- a/tests/noop/spec/hosts/cluster/cluster_spec.rb +++ b/tests/noop/spec/hosts/cluster/cluster_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/cluster/health_spec.rb b/tests/noop/spec/hosts/cluster/health_spec.rb index b9ab51ba21..453d33a5c4 100644 --- a/tests/noop/spec/hosts/cluster/health_spec.rb +++ b/tests/noop/spec/hosts/cluster/health_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/database/database_spec.rb b/tests/noop/spec/hosts/database/database_spec.rb index 3659076b3d..2e33105f4b 100644 --- a/tests/noop/spec/hosts/database/database_spec.rb +++ b/tests/noop/spec/hosts/database/database_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/dns/dns-client_spec.rb b/tests/noop/spec/hosts/dns/dns-client_spec.rb index b3bcf0f76b..83eaa886cd 100644 --- a/tests/noop/spec/hosts/dns/dns-client_spec.rb +++ b/tests/noop/spec/hosts/dns/dns-client_spec.rb @@ -1,23 +1,11 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'dns/dns-client.pp' diff --git a/tests/noop/spec/hosts/dns/dns-server_spec.rb b/tests/noop/spec/hosts/dns/dns-server_spec.rb index fd17ce346d..b55d41ec27 100644 --- a/tests/noop/spec/hosts/dns/dns-server_spec.rb +++ b/tests/noop/spec/hosts/dns/dns-server_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/firewall/firewall_spec.rb b/tests/noop/spec/hosts/firewall/firewall_spec.rb index 912bdbc610..3562035950 100644 --- a/tests/noop/spec/hosts/firewall/firewall_spec.rb +++ b/tests/noop/spec/hosts/firewall/firewall_spec.rb @@ -1,23 +1,13 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'firewall/firewall.pp' diff --git a/tests/noop/spec/hosts/fuel_pkgs/fuel_pkgs_spec.rb b/tests/noop/spec/hosts/fuel_pkgs/fuel_pkgs_spec.rb index a2c69378a1..acefe95506 100644 --- a/tests/noop/spec/hosts/fuel_pkgs/fuel_pkgs_spec.rb +++ b/tests/noop/spec/hosts/fuel_pkgs/fuel_pkgs_spec.rb @@ -1,23 +1,13 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'fuel_pkgs/fuel_pkgs.pp' diff --git a/tests/noop/spec/hosts/fuel_pkgs/setup_repositories_spec.rb b/tests/noop/spec/hosts/fuel_pkgs/setup_repositories_spec.rb index bcb6e4f329..1ee5567257 100644 --- a/tests/noop/spec/hosts/fuel_pkgs/setup_repositories_spec.rb +++ b/tests/noop/spec/hosts/fuel_pkgs/setup_repositories_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'fuel_pkgs/setup_repositories.pp' diff --git a/tests/noop/spec/hosts/generate_vms/generate_vms_spec.rb b/tests/noop/spec/hosts/generate_vms/generate_vms_spec.rb index 8d47e41cb1..19135a2ba8 100644 --- a/tests/noop/spec/hosts/generate_vms/generate_vms_spec.rb +++ b/tests/noop/spec/hosts/generate_vms/generate_vms_spec.rb @@ -1,4 +1,4 @@ -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/glance/db_spec.rb b/tests/noop/spec/hosts/glance/db_spec.rb index fc171a8a4a..7e16b72662 100644 --- a/tests/noop/spec/hosts/glance/db_spec.rb +++ b/tests/noop/spec/hosts/glance/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/glance/glance_spec.rb b/tests/noop/spec/hosts/glance/glance_spec.rb index 27c02405ab..6c4f2df16c 100644 --- a/tests/noop/spec/hosts/glance/glance_spec.rb +++ b/tests/noop/spec/hosts/glance/glance_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller # FIXME: neut_vxlan_dvr.murano.sahara-primary-controller ubuntu # FIXME: neut_vxlan_dvr.murano.sahara-primary-controller ubuntu diff --git a/tests/noop/spec/hosts/glance/keystone_spec.rb b/tests/noop/spec/hosts/glance/keystone_spec.rb index 7153ebd332..306c6ee6c1 100644 --- a/tests/noop/spec/hosts/glance/keystone_spec.rb +++ b/tests/noop/spec/hosts/glance/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/globals/globals_spec.rb b/tests/noop/spec/hosts/globals/globals_spec.rb index 7af8c4c65e..af49af8dfc 100644 --- a/tests/noop/spec/hosts/globals/globals_spec.rb +++ b/tests/noop/spec/hosts/globals/globals_spec.rb @@ -1,3 +1,14 @@ +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/heat/db_spec.rb b/tests/noop/spec/hosts/heat/db_spec.rb index 3f48b427de..8caaf4c083 100644 --- a/tests/noop/spec/hosts/heat/db_spec.rb +++ b/tests/noop/spec/hosts/heat/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/heat/heat_spec.rb b/tests/noop/spec/hosts/heat/heat_spec.rb index 3c2cbcb49a..dacee94f76 100644 --- a/tests/noop/spec/hosts/heat/heat_spec.rb +++ b/tests/noop/spec/hosts/heat/heat_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/heat/keystone_spec.rb b/tests/noop/spec/hosts/heat/keystone_spec.rb index 297c554cbd..a0eb8927e9 100644 --- a/tests/noop/spec/hosts/heat/keystone_spec.rb +++ b/tests/noop/spec/hosts/heat/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/hiera/hiera_spec.rb b/tests/noop/spec/hosts/hiera/hiera_spec.rb index ae9eaf7f30..6963d291b6 100644 --- a/tests/noop/spec/hosts/hiera/hiera_spec.rb +++ b/tests/noop/spec/hosts/hiera/hiera_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/hiera/override_configuration_spec.rb b/tests/noop/spec/hosts/hiera/override_configuration_spec.rb index 62a0de05fb..e1efeeb84d 100644 --- a/tests/noop/spec/hosts/hiera/override_configuration_spec.rb +++ b/tests/noop/spec/hosts/hiera/override_configuration_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/horizon/horizon_spec.rb b/tests/noop/spec/hosts/horizon/horizon_spec.rb index 8382a05335..52f288ad39 100644 --- a/tests/noop/spec/hosts/horizon/horizon_spec.rb +++ b/tests/noop/spec/hosts/horizon/horizon_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/hosts/hosts_spec.rb b/tests/noop/spec/hosts/hosts/hosts_spec.rb index 5b70380c9f..ac6149a3ff 100644 --- a/tests/noop/spec/hosts/hosts/hosts_spec.rb +++ b/tests/noop/spec/hosts/hosts/hosts_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'hosts/hosts.pp' diff --git a/tests/noop/spec/hosts/ironic/db_spec.rb b/tests/noop/spec/hosts/ironic/db_spec.rb index 47be95d5b6..e201cd2fad 100644 --- a/tests/noop/spec/hosts/ironic/db_spec.rb +++ b/tests/noop/spec/hosts/ironic/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb index 44fa5f2d83..c3e97a754e 100644 --- a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb +++ b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb @@ -1,15 +1,8 @@ -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' -manifest = 'roles/ironic-compute.pp' +manifest = 'ironic/ironic-compute.pp' describe manifest do diff --git a/tests/noop/spec/hosts/ironic/ironic_spec.rb b/tests/noop/spec/hosts/ironic/ironic_spec.rb index 2e0031837e..7e48df2fce 100644 --- a/tests/noop/spec/hosts/ironic/ironic_spec.rb +++ b/tests/noop/spec/hosts/ironic/ironic_spec.rb @@ -1,17 +1,9 @@ -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' manifest = 'ironic/ironic.pp' -# SKIP_HIERA: neut_vlan.ironic.controller ironic_enabled = Noop.hiera_structure 'ironic/enabled' if ironic_enabled diff --git a/tests/noop/spec/hosts/ironic/keystone_spec.rb b/tests/noop/spec/hosts/ironic/keystone_spec.rb index d58123cd78..8607e679b2 100644 --- a/tests/noop/spec/hosts/ironic/keystone_spec.rb +++ b/tests/noop/spec/hosts/ironic/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/keystone/db_spec.rb b/tests/noop/spec/hosts/keystone/db_spec.rb index def39f40cb..e09c167e04 100644 --- a/tests/noop/spec/hosts/keystone/db_spec.rb +++ b/tests/noop/spec/hosts/keystone/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb index 35ad87f2cc..41453c4739 100644 --- a/tests/noop/spec/hosts/keystone/keystone_spec.rb +++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/keystone/openrc_delete_spec.rb b/tests/noop/spec/hosts/keystone/openrc_delete_spec.rb index 94ee279f94..a0f54ca052 100644 --- a/tests/noop/spec/hosts/keystone/openrc_delete_spec.rb +++ b/tests/noop/spec/hosts/keystone/openrc_delete_spec.rb @@ -1,23 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' manifest = 'keystone/openrc_delete.pp' diff --git a/tests/noop/spec/hosts/keystone/workloads_collector_add_spec.rb b/tests/noop/spec/hosts/keystone/workloads_collector_add_spec.rb index 028fe01b2e..fae5834e18 100644 --- a/tests/noop/spec/hosts/keystone/workloads_collector_add_spec.rb +++ b/tests/noop/spec/hosts/keystone/workloads_collector_add_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/keystone/workloads_collector_remove_spec.rb b/tests/noop/spec/hosts/keystone/workloads_collector_remove_spec.rb index 1a979b2435..5d84c35381 100644 --- a/tests/noop/spec/hosts/keystone/workloads_collector_remove_spec.rb +++ b/tests/noop/spec/hosts/keystone/workloads_collector_remove_spec.rb @@ -1,11 +1,7 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# TODO: (adidenko) this manifest is not present in task graph, so basically +# Fuel does not run this manifest. So we have this noop test just to +# test the manifest, it's not actually executed on primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/logging/logging_spec.rb b/tests/noop/spec/hosts/logging/logging_spec.rb index 14f093ee58..9afd123fe6 100644 --- a/tests/noop/spec/hosts/logging/logging_spec.rb +++ b/tests/noop/spec/hosts/logging/logging_spec.rb @@ -1,23 +1,14 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/memcached/memcached_spec.rb b/tests/noop/spec/hosts/memcached/memcached_spec.rb index 68e9789e6c..e1f4723318 100644 --- a/tests/noop/spec/hosts/memcached/memcached_spec.rb +++ b/tests/noop/spec/hosts/memcached/memcached_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/cfapi_spec.rb b/tests/noop/spec/hosts/murano/cfapi_spec.rb index 4ad30b0864..fd1b87c873 100644 --- a/tests/noop/spec/hosts/murano/cfapi_spec.rb +++ b/tests/noop/spec/hosts/murano/cfapi_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/db_spec.rb b/tests/noop/spec/hosts/murano/db_spec.rb index 5de044dbcd..9419604f72 100644 --- a/tests/noop/spec/hosts/murano/db_spec.rb +++ b/tests/noop/spec/hosts/murano/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/keystone_cfapi_spec.rb b/tests/noop/spec/hosts/murano/keystone_cfapi_spec.rb index d945831887..be20832136 100644 --- a/tests/noop/spec/hosts/murano/keystone_cfapi_spec.rb +++ b/tests/noop/spec/hosts/murano/keystone_cfapi_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/keystone_spec.rb b/tests/noop/spec/hosts/murano/keystone_spec.rb index 409a64d866..3dd372985f 100644 --- a/tests/noop/spec/hosts/murano/keystone_spec.rb +++ b/tests/noop/spec/hosts/murano/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/murano_spec.rb b/tests/noop/spec/hosts/murano/murano_spec.rb index 3e7d144b5c..2bf8ce80ac 100644 --- a/tests/noop/spec/hosts/murano/murano_spec.rb +++ b/tests/noop/spec/hosts/murano/murano_spec.rb @@ -1,13 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_vxlan_dvr.murano.sahara-cinder.yaml -# RUN: neut_vxlan_dvr.murano.sahara-compute.yaml +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/murano/rabbitmq_spec.rb b/tests/noop/spec/hosts/murano/rabbitmq_spec.rb index 13e93460b8..340d4785d8 100644 --- a/tests/noop/spec/hosts/murano/rabbitmq_spec.rb +++ b/tests/noop/spec/hosts/murano/rabbitmq_spec.rb @@ -1,13 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_vxlan_dvr.murano.sahara-cinder.yaml -# RUN: neut_vxlan_dvr.murano.sahara-compute.yaml +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/netconfig/configure_default_route_spec.rb b/tests/noop/spec/hosts/netconfig/configure_default_route_spec.rb index a746d9508e..f4f2a41a10 100644 --- a/tests/noop/spec/hosts/netconfig/configure_default_route_spec.rb +++ b/tests/noop/spec/hosts/netconfig/configure_default_route_spec.rb @@ -1,22 +1,10 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-mongo +# ROLE: mongo +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/netconfig/connectivity_tests_spec.rb b/tests/noop/spec/hosts/netconfig/connectivity_tests_spec.rb index e3c1b0c269..db2962aa25 100644 --- a/tests/noop/spec/hosts/netconfig/connectivity_tests_spec.rb +++ b/tests/noop/spec/hosts/netconfig/connectivity_tests_spec.rb @@ -1,23 +1,14 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'netconfig/connectivity_tests.pp' diff --git a/tests/noop/spec/hosts/netconfig/netconfig_spec.rb b/tests/noop/spec/hosts/netconfig/netconfig_spec.rb index b72af1e919..7c24df0778 100644 --- a/tests/noop/spec/hosts/netconfig/netconfig_spec.rb +++ b/tests/noop/spec/hosts/netconfig/netconfig_spec.rb @@ -1,23 +1,14 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'netconfig/netconfig.pp' diff --git a/tests/noop/spec/hosts/netconfig/reserved_ports_spec.rb b/tests/noop/spec/hosts/netconfig/reserved_ports_spec.rb index e2eca262c2..dd2f0e35cf 100644 --- a/tests/noop/spec/hosts/netconfig/reserved_ports_spec.rb +++ b/tests/noop/spec/hosts/netconfig/reserved_ports_spec.rb @@ -1,23 +1,14 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'netconfig/reserved_ports.pp' diff --git a/tests/noop/spec/hosts/netconfig/sriov_iommu_check_spec.rb b/tests/noop/spec/hosts/netconfig/sriov_iommu_check_spec.rb index b1c4a13fff..0d4efb3966 100644 --- a/tests/noop/spec/hosts/netconfig/sriov_iommu_check_spec.rb +++ b/tests/noop/spec/hosts/netconfig/sriov_iommu_check_spec.rb @@ -1,7 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ntp/ntp-check_spec.rb b/tests/noop/spec/hosts/ntp/ntp-check_spec.rb index fe1905a30d..2fc55dbf6c 100644 --- a/tests/noop/spec/hosts/ntp/ntp-check_spec.rb +++ b/tests/noop/spec/hosts/ntp/ntp-check_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ntp/ntp-client_spec.rb b/tests/noop/spec/hosts/ntp/ntp-client_spec.rb index 5c3a622c80..cce7752b83 100644 --- a/tests/noop/spec/hosts/ntp/ntp-client_spec.rb +++ b/tests/noop/spec/hosts/ntp/ntp-client_spec.rb @@ -1,22 +1,9 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-mongo +# ROLE: mongo +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ntp/ntp-server_spec.rb b/tests/noop/spec/hosts/ntp/ntp-server_spec.rb index a989fdb860..d9ec51d156 100644 --- a/tests/noop/spec/hosts/ntp/ntp-server_spec.rb +++ b/tests/noop/spec/hosts/ntp/ntp-server_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ntp/timesync_spec.rb b/tests/noop/spec/hosts/ntp/timesync_spec.rb index b0c0814c88..bcbb4411d7 100644 --- a/tests/noop/spec/hosts/ntp/timesync_spec.rb +++ b/tests/noop/spec/hosts/ntp/timesync_spec.rb @@ -1,23 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# TODO: DEPRECATED require 'spec_helper' require 'shared-examples' manifest = 'ntp/timesync.pp' diff --git a/tests/noop/spec/hosts/openstack-cinder/create_cinder_types_spec.rb b/tests/noop/spec/hosts/openstack-cinder/create_cinder_types_spec.rb index 0f417ae529..4f6f4a55f7 100644 --- a/tests/noop/spec/hosts/openstack-cinder/create_cinder_types_spec.rb +++ b/tests/noop/spec/hosts/openstack-cinder/create_cinder_types_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-cinder/db_spec.rb b/tests/noop/spec/hosts/openstack-cinder/db_spec.rb index ae1cd021cc..bd80171ec6 100644 --- a/tests/noop/spec/hosts/openstack-cinder/db_spec.rb +++ b/tests/noop/spec/hosts/openstack-cinder/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-cinder/keystone_spec.rb b/tests/noop/spec/hosts/openstack-cinder/keystone_spec.rb index ce613a132c..afc120704d 100644 --- a/tests/noop/spec/hosts/openstack-cinder/keystone_spec.rb +++ b/tests/noop/spec/hosts/openstack-cinder/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb b/tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb index c659bef183..bc8060a398 100644 --- a/tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb +++ b/tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-controller/db_spec.rb b/tests/noop/spec/hosts/openstack-controller/db_spec.rb index 6c6af0ef6a..5c828b4660 100644 --- a/tests/noop/spec/hosts/openstack-controller/db_spec.rb +++ b/tests/noop/spec/hosts/openstack-controller/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb b/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb index 7e6e3e3985..c416cebd3f 100644 --- a/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb +++ b/tests/noop/spec/hosts/openstack-controller/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb index bf4fb87a5b..80952f8349 100644 --- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb +++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-aodh_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-aodh_spec.rb index 94b476074f..4e58b11f10 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-aodh_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-aodh_spec.rb @@ -1,14 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# SKIP_HIERA: neut_vlan.ceph.ceil-primary-controller.overridden_ssl FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-controller ubuntu FIXME -# SKIP_HIERA: neut_vlan_l3ha.ceph.ceil-primary-controller ubuntu FIXME +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ceilometer_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ceilometer_spec.rb index 5fb074c0ed..5c6581c316 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ceilometer_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ceilometer_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-cinder_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-cinder_spec.rb index 630001d196..ea4dde9fb6 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-cinder_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-cinder_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-glance_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-glance_spec.rb index 6dda8c74d4..49ee987dcc 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-glance_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-glance_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-heat_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-heat_spec.rb index 5b3f913e76..df120b85af 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-heat_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-heat_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb index a1c919c4c6..aecd0466b1 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ironic_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ironic_spec.rb index aa5573c613..94f1bf76a4 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ironic_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-ironic_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-keystone_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-keystone_spec.rb index 5fade17c21..4271a20d8e 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-keystone_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-keystone_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-murano_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-murano_spec.rb index 4848b18463..a2e576dbaa 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-murano_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-murano_spec.rb @@ -1,13 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_vxlan_dvr.murano.sahara-cinder.yaml -# RUN: neut_vxlan_dvr.murano.sahara-compute.yaml +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb index 0f1913f76d..5dcebeda56 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-neutron_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-neutron_spec.rb index bd1769c708..a99393d1a1 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-neutron_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-neutron_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-nova_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-nova_spec.rb index bab2093080..269b0aa369 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-nova_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-nova_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb index 4563a12610..b12dc5f7e2 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-sahara_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-sahara_spec.rb index 48262a96b0..9c5a7a348a 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-sahara_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-sahara_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-stats_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-stats_spec.rb index 146ddb1b72..7b2406728e 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-stats_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-stats_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb index 1143509b73..0490bebb76 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-swift_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy_spec.rb index 4123695990..169ff7d9e6 100644 --- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy_spec.rb +++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/agents/dhcp_spec.rb b/tests/noop/spec/hosts/openstack-network/agents/dhcp_spec.rb index f88a02caaf..715e74f38a 100644 --- a/tests/noop/spec/hosts/openstack-network/agents/dhcp_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/agents/dhcp_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb b/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb index a8dfa8986f..c7905ed8da 100644 --- a/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/agents/l3_spec.rb @@ -1,15 +1,6 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-controller +# ROLE: controller +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/agents/metadata_spec.rb b/tests/noop/spec/hosts/openstack-network/agents/metadata_spec.rb index 275f4899dc..e38421f4bb 100644 --- a/tests/noop/spec/hosts/openstack-network/agents/metadata_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/agents/metadata_spec.rb @@ -1,15 +1,6 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-controller +# ROLE: controller +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/agents/sriov_spec.rb b/tests/noop/spec/hosts/openstack-network/agents/sriov_spec.rb index 588d14e9b9..ffa95bd00b 100644 --- a/tests/noop/spec/hosts/openstack-network/agents/sriov_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/agents/sriov_spec.rb @@ -1,7 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/common-config_spec.rb b/tests/noop/spec/hosts/openstack-network/common-config_spec.rb index 04f08eba41..5b0d2e55b8 100644 --- a/tests/noop/spec/hosts/openstack-network/common-config_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/common-config_spec.rb @@ -1,15 +1,6 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-controller +# ROLE: controller +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/compute-nova_spec.rb b/tests/noop/spec/hosts/openstack-network/compute-nova_spec.rb index 40ce7a080f..b96940de4c 100644 --- a/tests/noop/spec/hosts/openstack-network/compute-nova_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/compute-nova_spec.rb @@ -1,7 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/db_spec.rb b/tests/noop/spec/hosts/openstack-network/db_spec.rb index 3b79481078..9afa47a3b3 100644 --- a/tests/noop/spec/hosts/openstack-network/db_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/keystone_spec.rb b/tests/noop/spec/hosts/openstack-network/keystone_spec.rb index cd21e94336..30f839e59d 100644 --- a/tests/noop/spec/hosts/openstack-network/keystone_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/networks_spec.rb b/tests/noop/spec/hosts/openstack-network/networks_spec.rb index 53abd98e9c..70321a6ea5 100644 --- a/tests/noop/spec/hosts/openstack-network/networks_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/networks_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb b/tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb index 1db044d82a..a48e2c105a 100644 --- a/tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb @@ -1,15 +1,6 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: primary-controller +# ROLE: controller +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/routers_spec.rb b/tests/noop/spec/hosts/openstack-network/routers_spec.rb index 5f5f356707..e60817d17e 100644 --- a/tests/noop/spec/hosts/openstack-network/routers_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/routers_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/server-config_spec.rb b/tests/noop/spec/hosts/openstack-network/server-config_spec.rb index f9c112849f..726bbd5e65 100644 --- a/tests/noop/spec/hosts/openstack-network/server-config_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/server-config_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/openstack-network/server-nova_spec.rb b/tests/noop/spec/hosts/openstack-network/server-nova_spec.rb index 822e330231..2fba93a3a2 100644 --- a/tests/noop/spec/hosts/openstack-network/server-nova_spec.rb +++ b/tests/noop/spec/hosts/openstack-network/server-nova_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/plugins/plugins_rsync_spec.rb b/tests/noop/spec/hosts/plugins/plugins_rsync_spec.rb index 05e3ecc727..32c2d1067a 100644 --- a/tests/noop/spec/hosts/plugins/plugins_rsync_spec.rb +++ b/tests/noop/spec/hosts/plugins/plugins_rsync_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'plugins/plugins_rsync.pp' diff --git a/tests/noop/spec/hosts/plugins/plugins_setup_repositories_spec.rb b/tests/noop/spec/hosts/plugins/plugins_setup_repositories_spec.rb index a9f454f994..4f8ff09e2d 100644 --- a/tests/noop/spec/hosts/plugins/plugins_setup_repositories_spec.rb +++ b/tests/noop/spec/hosts/plugins/plugins_setup_repositories_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'plugins/plugins_setup_repositories.pp' diff --git a/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb b/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb index 0e77d34cd6..1b64c827f6 100644 --- a/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb +++ b/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/roles/allocate_hugepages_spec.rb b/tests/noop/spec/hosts/roles/allocate_hugepages_spec.rb index 26c702a256..31b2ae0aab 100644 --- a/tests/noop/spec/hosts/roles/allocate_hugepages_spec.rb +++ b/tests/noop/spec/hosts/roles/allocate_hugepages_spec.rb @@ -1,23 +1,16 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd +# ROLE: base-os require 'spec_helper' require 'shared-examples' manifest = 'roles/allocate_hugepages.pp' diff --git a/tests/noop/spec/hosts/roles/cinder_spec.rb b/tests/noop/spec/hosts/roles/cinder_spec.rb index ed6f3c811b..2bfbf97c7f 100644 --- a/tests/noop/spec/hosts/roles/cinder_spec.rb +++ b/tests/noop/spec/hosts/roles/cinder_spec.rb @@ -1,5 +1,6 @@ -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder-block-device ubuntu +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder require 'spec_helper' require 'shared-examples' manifest = 'roles/cinder.pp' diff --git a/tests/noop/spec/hosts/roles/compute_spec.rb b/tests/noop/spec/hosts/roles/compute_spec.rb index c47bbae427..0754c08de3 100644 --- a/tests/noop/spec/hosts/roles/compute_spec.rb +++ b/tests/noop/spec/hosts/roles/compute_spec.rb @@ -1,7 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/roles/controller_spec.rb b/tests/noop/spec/hosts/roles/controller_spec.rb index 9057497a19..37c3b5e6f5 100644 --- a/tests/noop/spec/hosts/roles/controller_spec.rb +++ b/tests/noop/spec/hosts/roles/controller_spec.rb @@ -1,22 +1,10 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' manifest = 'roles/controller.pp' - - - describe manifest do shared_examples 'catalog' do diff --git a/tests/noop/spec/hosts/roles/enable_cinder_spec.rb b/tests/noop/spec/hosts/roles/enable_cinder_spec.rb index f911ed4fbb..6773c46079 100644 --- a/tests/noop/spec/hosts/roles/enable_cinder_spec.rb +++ b/tests/noop/spec/hosts/roles/enable_cinder_spec.rb @@ -1,7 +1,5 @@ -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: cinder-block-device +# ROLE: cinder require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/roles/enable_compute_spec.rb b/tests/noop/spec/hosts/roles/enable_compute_spec.rb index 6471b5f0c3..dd067c5ca4 100644 --- a/tests/noop/spec/hosts/roles/enable_compute_spec.rb +++ b/tests/noop/spec/hosts/roles/enable_compute_spec.rb @@ -1,7 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: compute-vmware +# ROLE: compute require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb index ead3e308c4..cf73f1e6b1 100644 --- a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb +++ b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb @@ -1,8 +1,8 @@ -# RUN: neut_tun.ironic-ironic ubuntu +# ROLE: ironic require 'spec_helper' require 'shared-examples' -manifest = 'roles/ironic.pp' +manifest = 'roles/ironic-conductor.pp' describe manifest do shared_examples 'catalog' do diff --git a/tests/noop/spec/hosts/roles/mongo_spec.rb b/tests/noop/spec/hosts/roles/mongo_spec.rb index 99f94cc806..260be48c6d 100644 --- a/tests/noop/spec/hosts/roles/mongo_spec.rb +++ b/tests/noop/spec/hosts/roles/mongo_spec.rb @@ -1,7 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu +# ROLE: primary-mongo +# ROLE: mongo require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/sahara/db_spec.rb b/tests/noop/spec/hosts/sahara/db_spec.rb index d0d484c229..d29055256c 100644 --- a/tests/noop/spec/hosts/sahara/db_spec.rb +++ b/tests/noop/spec/hosts/sahara/db_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/sahara/keystone_spec.rb b/tests/noop/spec/hosts/sahara/keystone_spec.rb index a42e98a22d..95238ae475 100644 --- a/tests/noop/spec/hosts/sahara/keystone_spec.rb +++ b/tests/noop/spec/hosts/sahara/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb index f4b7d97442..fef76dba72 100644 --- a/tests/noop/spec/hosts/sahara/sahara_spec.rb +++ b/tests/noop/spec/hosts/sahara/sahara_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ssl/ssl_add_trust_chain_spec.rb b/tests/noop/spec/hosts/ssl/ssl_add_trust_chain_spec.rb index 8a267adbac..fee04a7fb7 100644 --- a/tests/noop/spec/hosts/ssl/ssl_add_trust_chain_spec.rb +++ b/tests/noop/spec/hosts/ssl/ssl_add_trust_chain_spec.rb @@ -1,22 +1,13 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ssl/ssl_dns_setup_spec.rb b/tests/noop/spec/hosts/ssl/ssl_dns_setup_spec.rb index cdac5dcfd3..14d17c1d82 100644 --- a/tests/noop/spec/hosts/ssl/ssl_dns_setup_spec.rb +++ b/tests/noop/spec/hosts/ssl/ssl_dns_setup_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/ssl/ssl_keys_saving_spec.rb b/tests/noop/spec/hosts/ssl/ssl_keys_saving_spec.rb index 712ad83a23..2ff81c3c9c 100644 --- a/tests/noop/spec/hosts/ssl/ssl_keys_saving_spec.rb +++ b/tests/noop/spec/hosts/ssl/ssl_keys_saving_spec.rb @@ -1,8 +1,17 @@ +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: controller +# ROLE: compute-vmware +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' manifest = 'ssl/ssl_keys_saving.pp' -# SKIP_HIERA: neut_vlan.cinder-block-device.compute describe manifest do shared_examples 'catalog' do diff --git a/tests/noop/spec/hosts/swift/keystone_spec.rb b/tests/noop/spec/hosts/swift/keystone_spec.rb index a65690c3bb..3b7e1dd56a 100644 --- a/tests/noop/spec/hosts/swift/keystone_spec.rb +++ b/tests/noop/spec/hosts/swift/keystone_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/swift/proxy_spec.rb b/tests/noop/spec/hosts/swift/proxy_spec.rb index 82c092c217..7e758fd701 100644 --- a/tests/noop/spec/hosts/swift/proxy_spec.rb +++ b/tests/noop/spec/hosts/swift/proxy_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' manifest = 'swift/proxy.pp' diff --git a/tests/noop/spec/hosts/swift/rebalance_cronjob_spec.rb b/tests/noop/spec/hosts/swift/rebalance_cronjob_spec.rb index 74935e8d98..0ffa31a5a2 100644 --- a/tests/noop/spec/hosts/swift/rebalance_cronjob_spec.rb +++ b/tests/noop/spec/hosts/swift/rebalance_cronjob_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/swift/storage_spec.rb b/tests/noop/spec/hosts/swift/storage_spec.rb index 0c68515164..8e642c1778 100644 --- a/tests/noop/spec/hosts/swift/storage_spec.rb +++ b/tests/noop/spec/hosts/swift/storage_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' manifest = 'swift/storage.pp' diff --git a/tests/noop/spec/hosts/swift/swift_spec.rb b/tests/noop/spec/hosts/swift/swift_spec.rb index f91248a93f..16c9bbadf2 100644 --- a/tests/noop/spec/hosts/swift/swift_spec.rb +++ b/tests/noop/spec/hosts/swift/swift_spec.rb @@ -1,11 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# TODO: DEPRECATED require 'spec_helper' require 'shared-examples' manifest = 'swift/swift.pp' diff --git a/tests/noop/spec/hosts/tools/tools_spec.rb b/tests/noop/spec/hosts/tools/tools_spec.rb index 009386f902..704d98e73a 100644 --- a/tests/noop/spec/hosts/tools/tools_spec.rb +++ b/tests/noop/spec/hosts/tools/tools_spec.rb @@ -1,23 +1,14 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-mongo ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-mongo ubuntu -# RUN: neut_vlan.murano.sahara.ceil-cinder ubuntu -# RUN: neut_tun.ironic-ironic ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-ceph-osd ubuntu -# RUN: neut_vlan.ceph-ceph-osd ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu -# R_N: neut_gre.generate_vms ubuntu +# ROLE: virt +# ROLE: primary-mongo +# ROLE: primary-controller +# ROLE: mongo +# ROLE: ironic +# ROLE: controller +# ROLE: compute +# ROLE: cinder-vmware +# ROLE: cinder-block-device +# ROLE: cinder +# ROLE: ceph-osd require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/umm/umm_spec.rb b/tests/noop/spec/hosts/umm/umm_spec.rb index d86a454e9a..0d46c88fc9 100644 --- a/tests/noop/spec/hosts/umm/umm_spec.rb +++ b/tests/noop/spec/hosts/umm/umm_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb b/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb index 498fdbea1a..9199a31076 100644 --- a/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb +++ b/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb b/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb index 41338e91b1..e2a631a461 100644 --- a/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb +++ b/tests/noop/spec/hosts/virtual_ips/public_vip_ping_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/virtual_ips/virtual_ips_spec.rb b/tests/noop/spec/hosts/virtual_ips/virtual_ips_spec.rb index b92196f62e..214461db46 100644 --- a/tests/noop/spec/hosts/virtual_ips/virtual_ips_spec.rb +++ b/tests/noop/spec/hosts/virtual_ips/virtual_ips_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/vmware/cinder-vmware_spec.rb b/tests/noop/spec/hosts/vmware/cinder-vmware_spec.rb index 737238c648..c7cc7fbf9d 100644 --- a/tests/noop/spec/hosts/vmware/cinder-vmware_spec.rb +++ b/tests/noop/spec/hosts/vmware/cinder-vmware_spec.rb @@ -1,6 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: cinder-vmware require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/vmware/compute-vmware_spec.rb b/tests/noop/spec/hosts/vmware/compute-vmware_spec.rb index 5a321c3809..e296ade09f 100644 --- a/tests/noop/spec/hosts/vmware/compute-vmware_spec.rb +++ b/tests/noop/spec/hosts/vmware/compute-vmware_spec.rb @@ -1,6 +1,4 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-compute ubuntu -# RUN: neut_vlan.ceph-compute ubuntu -# RUN: neut_vlan.murano.sahara.ceil-compute ubuntu +# ROLE: compute-vmware require 'spec_helper' require 'shared-examples' diff --git a/tests/noop/spec/hosts/vmware/vcenter_spec.rb b/tests/noop/spec/hosts/vmware/vcenter_spec.rb index 9363dcb681..95f438d067 100644 --- a/tests/noop/spec/hosts/vmware/vcenter_spec.rb +++ b/tests/noop/spec/hosts/vmware/vcenter_spec.rb @@ -1,11 +1,5 @@ -# RUN: neut_tun.ceph.murano.sahara.ceil-controller ubuntu -# RUN: neut_tun.ceph.murano.sahara.ceil-primary-controller ubuntu -# RUN: neut_tun.ironic-primary-controller ubuntu -# RUN: neut_tun.l3ha-primary-controller ubuntu -# RUN: neut_vlan.ceph-primary-controller ubuntu -# RUN: neut_vlan.dvr-primary-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-controller ubuntu -# RUN: neut_vlan.murano.sahara.ceil-primary-controller ubuntu +# ROLE: primary-controller +# ROLE: controller require 'spec_helper' require 'shared-examples'