[virtual] Rename all to drop virtual prefix

JIRA: FUEL-322

Change-Id: I99c4b1774a7c3afbc834a6f6e8468f7baf1bc329
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
index b35e66f..4af625b 100644 (file)
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-ovs-noha.local
+  domain: mcp-pike-ovs-noha.local
   states:
     - openstack_noha
     - neutron_gateway

diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index e3cd3db..a1e53e7 100644 (file)
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-ovs-dpdk-noha.local
+  domain: mcp-pike-ovs-dpdk-noha.local
   states:
     - dpdk
     - openstack_noha

diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index cef4127..35b2904 100644 (file)
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-odl-noha.local
+  domain: mcp-pike-odl-noha.local
   states:
     - opendaylight
     - openstack_noha

diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index e0a19eb..8f29d7b 100644 (file)
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-ovn-noha.local
+  domain: mcp-pike-ovn-noha.local
   states:
     - openstack_noha
     - ovn_ctl_opts

diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst
index 0384c6d..6923404 100644 (file)
--- a/mcp/reclass/classes/cluster/README.rst
+++ b/mcp/reclass/classes/cluster/README.rst
@@ -12,12 +12,12 @@ Overview
 
    - all-mcp-arch-common
 
-#. Common classes (HA baremetal/virtual, noHA baremetal)
+#. Common classes (HA baremetal/virtual, noHA virtual)
 
    - mcp-<release>-common-ha
-   - virtual-mcp-<release>-common-noha
+   - mcp-<release>-common-noha
 
 #. Cluster specific classes
 
    - mcp-<release>-*-{ha,noha}
-   - virtual-mcp-<release>-*-{ha,noha}
+   - mcp-<release>-*-{ha,noha}

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
similarity index 96%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
index 0f89d50..710dee8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
@@ -15,7 +15,7 @@ classes:
   - system.ceilometer.agent.cluster
   - system.ceilometer.client.nova_compute
   - system.ceilometer.client.cinder_volume
-  - cluster.virtual-mcp-pike-common-noha.openstack_compute_pdf
+  - cluster.mcp-pike-common-noha.openstack_compute_pdf
 parameters:
   _param:
     interface_mtu: 9000

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute_pdf.yml.j2
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
similarity index 96%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
index 30e880f..5974db3 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
@@ -43,8 +43,8 @@ classes:
   - system.aodh.server.single
   - system.horizon.server.single
   - service.haproxy.proxy.single
-  - cluster.virtual-mcp-pike-common-noha.haproxy_openstack_api
-  - cluster.virtual-mcp-pike-common-noha.openstack_control_pdf
+  - cluster.mcp-pike-common-noha.haproxy_openstack_api
+  - cluster.mcp-pike-common-noha.openstack_control_pdf
 parameters:
   _param:
     linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control_pdf.yml.j2
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
similarity index 91%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
index 6c10bf8..918ab2f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_gateway_pdf
+  - cluster.mcp-pike-common-noha.openstack_gateway_pdf
 parameters:
   _param:
     interface_mtu: 9000

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway_pdf.yml.j2
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml
similarity index 92%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml
index 037b357..29db738 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml
@@ -9,8 +9,8 @@
 classes:
   - system.reclass.storage.system.opendaylight_control_single
   - system.reclass.storage.system.openstack_gateway_single
-  - cluster.virtual-mcp-pike-common-noha.infra.config
-  - cluster.virtual-mcp-pike-odl-noha
+  - cluster.mcp-pike-common-noha.infra.config
+  - cluster.mcp-pike-odl-noha
 parameters:
   reclass:
     storage:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
similarity index 84%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
index 0f21b91..16d17de 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.mcp-pike-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: virtual-mcp-pike-ovs-noha
+    cluster_name: mcp-pike-odl-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml
similarity index 80%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml
index e5bacff..42fc49b 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml
@@ -8,9 +8,9 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-odl-noha.infra
-  - cluster.virtual-mcp-pike-odl-noha.openstack
+  - cluster.mcp-pike-common-noha.init_options
+  - cluster.mcp-pike-odl-noha.infra
+  - cluster.mcp-pike-odl-noha.openstack
 
 parameters:
   _param:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
similarity index 90%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
index b53af0f..c192192 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml
@@ -10,8 +10,8 @@ classes:
   - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
   - system.opendaylight.server.single
-  - cluster.virtual-mcp-pike-odl-noha
-  - cluster.virtual-mcp-pike-odl-noha.opendaylight.control_pdf
+  - cluster.mcp-pike-odl-noha
+  - cluster.mcp-pike-odl-noha.opendaylight.control_pdf
 parameters:
   _param:
     linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
similarity index 95%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
index 6aef9b4..9a96470 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - service.neutron.compute.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_compute
-  - cluster.virtual-mcp-pike-odl-noha
+  - cluster.mcp-pike-common-noha.openstack_compute
+  - cluster.mcp-pike-odl-noha
 parameters:
   opendaylight:
     client:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
index ede9d4c..e8715a4 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.opendaylight.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_control
-  - cluster.virtual-mcp-pike-odl-noha
+  - cluster.mcp-pike-common-noha.openstack_control
+  - cluster.mcp-pike-odl-noha
 parameters:
   neutron:
     server:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
index 47d11cd..0de90c6 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-pike-common-noha.openstack_gateway
   - system.neutron.gateway.opendaylight.single
-  - cluster.virtual-mcp-pike-odl-noha
+  - cluster.mcp-pike-odl-noha
 parameters:
   _param:
     neutron_agents:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
index 4607190..d8e7296 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_init
+  - cluster.mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml
similarity index 83%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml
index 4d0a772..762ca09 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.infra.config
-  - cluster.virtual-mcp-pike-ovn-noha
+  - cluster.mcp-pike-common-noha.infra.config
+  - cluster.mcp-pike-ovn-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml
similarity index 84%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml
index 5a79add..e1e068d 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.mcp-pike-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: virtual-mcp-pike-ovn-noha
+    cluster_name: mcp-pike-ovn-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml
similarity index 77%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml
index ac8a45f..5d333af 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-ovs-noha.infra
-  - cluster.virtual-mcp-pike-ovs-noha.openstack
+  - cluster.mcp-pike-common-noha.init_options
+  - cluster.mcp-pike-ovn-noha.infra
+  - cluster.mcp-pike-ovn-noha.openstack

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
similarity index 94%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
index a08c652..06a0dc8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - service.neutron.compute.ovn.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_compute
-  - cluster.virtual-mcp-pike-ovn-noha
+  - cluster.mcp-pike-common-noha.openstack_compute
+  - cluster.mcp-pike-ovn-noha
 parameters:
   linux:
     network:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml
similarity index 83%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml
index 59c0007..dfcd76f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.ovn.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_control
-  - cluster.virtual-mcp-pike-ovn-noha
+  - cluster.mcp-pike-common-noha.openstack_control
+  - cluster.mcp-pike-ovn-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml
index 8ae6607..658b8ad 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml
@@ -7,4 +7,4 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_init
+  - cluster.mcp-pike-common-noha.openstack_init

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
index fc052e5..0081049 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.openstack_gateway_single
-  - cluster.virtual-mcp-pike-common-noha.infra.config
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-pike-common-noha.infra.config
+  - cluster.mcp-pike-ovs-dpdk-noha
   - cluster.all-mcp-arch-common.infra.config_dpdk_pdf
 parameters:
   reclass:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml
similarity index 84%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml
index 2cf01ee..b8fd805 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.mcp-pike-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: virtual-mcp-pike-odl-noha
+    cluster_name: mcp-pike-ovs-dpdk-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
similarity index 77%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
index 6ab0986..e9322c3 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovn-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-ovn-noha.infra
-  - cluster.virtual-mcp-pike-ovn-noha.openstack
+  - cluster.mcp-pike-common-noha.init_options
+  - cluster.mcp-pike-ovs-dpdk-noha.infra
+  - cluster.mcp-pike-ovs-dpdk-noha.openstack

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
similarity index 90%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
index c59cdaa..46fc17c 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml
@@ -10,8 +10,8 @@ classes:
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
   - service.neutron.compute.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_compute
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-pike-common-noha.openstack_compute
+  - cluster.mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     compute:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
similarity index 85%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
index 4dbaae8..b2ebb6d 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_control
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-pike-common-noha.openstack_control
+  - cluster.mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     server:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
similarity index 88%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
index ec943a8..eb963f1 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-pike-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha
+  - cluster.mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     gateway:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
index 5445a07..929a445 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_init
+  - cluster.mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vlan"

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml
index 7a0cce3..9167ee6 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.openstack_gateway_single
-  - cluster.virtual-mcp-pike-common-noha.infra.config
-  - cluster.virtual-mcp-pike-ovs-noha
+  - cluster.mcp-pike-common-noha.infra.config
+  - cluster.mcp-pike-ovs-noha
 parameters:
   reclass:
     storage:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml
similarity index 83%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml
index 50676fc..5c01e4b 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.mcp-pike-common-noha.infra
 
 parameters:
   _param:
-    cluster_name: virtual-mcp-pike-ovs-dpdk-noha
+    cluster_name: mcp-pike-ovs-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml
similarity index 76%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml
index 1b1dcd0..99df0ec 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.virtual-mcp-pike-common-noha.init_options
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack
+  - cluster.mcp-pike-common-noha.init_options
+  - cluster.mcp-pike-ovs-noha.infra
+  - cluster.mcp-pike-ovs-noha.openstack

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml
index 52edf87..55d1d94 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - service.neutron.compute.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_compute
-  - cluster.virtual-mcp-pike-ovs-noha
+  - cluster.mcp-pike-common-noha.openstack_compute
+  - cluster.mcp-pike-ovs-noha
 parameters:
   linux:
     network:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml
similarity index 84%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml
index 4e03c4b..07b55b4 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-pike-common-noha.openstack_control
-  - cluster.virtual-mcp-pike-ovs-noha
+  - cluster.mcp-pike-common-noha.openstack_control
+  - cluster.mcp-pike-ovs-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml
index 0eec95c..d002735 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
+  - cluster.mcp-pike-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-pike-ovs-noha
+  - cluster.mcp-pike-ovs-noha
 parameters:
   linux:
     network:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml
similarity index 90%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml
index 19126f8..5900a3e 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common-noha.openstack_init
+  - cluster.mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml
similarity index 86%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml
rename to mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml
index 8828a93..a4a21ba 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-odl-noha.infra.config
+  - cluster.mcp-pike-odl-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-odl-noha.local
+      domain: mcp-pike-odl-noha.local

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml
similarity index 86%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovn-noha.local.yml
rename to mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml
index fb40f65..0df357a 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovn-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-ovn-noha.infra.config
+  - cluster.mcp-pike-ovn-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-ovn-noha.local
+      domain: mcp-pike-ovn-noha.local

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml
similarity index 86%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml
rename to mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml
index 7a715cf..394a9f6 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-ovs-noha.infra.config
+  - cluster.mcp-pike-ovs-dpdk-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-ovs-noha.local
+      domain: mcp-pike-ovs-dpdk-noha.local

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml
similarity index 84%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml
rename to mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml
index 4c435f8..793e7c0 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra.config
+  - cluster.mcp-pike-ovs-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-ovs-dpdk-noha.local
+      domain: mcp-pike-ovs-noha.local