From: Alexandru Avadanii Date: Wed, 7 Feb 2018 14:53:12 +0000 (+0000) Subject: Merge "[virtual] Rename all to drop virtual prefix" X-Git-Tag: opnfv-6.0.0~96 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2f874c8729bd80f34e5994fe07f116c82c9b1695;hp=0f1bef52ce8e7040934ec16894b266579bb82c58;p=fuel.git Merge "[virtual] Rename all to drop virtual prefix" --- diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index b35e66fc7..4af625b25 100644 --- 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 e3cd3dbd9..a1e53e750 100644 --- 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 cef41270c..35b290428 100644 --- 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 e0a19ebb2..8f29d7bb1 100644 --- 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 0384c6d26..69234043a 100644 --- 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--common-ha - - virtual-mcp--common-noha + - mcp--common-noha #. Cluster specific classes - mcp--*-{ha,noha} - - virtual-mcp--*-{ha,noha} + - mcp--*-{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 0f89d50d6..710dee8e7 100644 --- 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 30e880f1e..5974db319 100644 --- 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 6c10bf897..918ab2f2e 100644 --- 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 037b3579f..29db738ac 100644 --- 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 0f21b9161..16d17de1e 100644 --- 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 e5bacffdc..42fc49be2 100644 --- 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 b53af0f66..c192192af 100644 --- 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 6aef9b46f..9a96470aa 100644 --- 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 ede9d4c5d..e8715a49e 100644 --- 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 47d11cd5d..0de90c652 100644 --- 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 4607190c7..d8e7296e5 100644 --- 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 4d0a77241..762ca093f 100644 --- 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 5a79adddf..e1e068db7 100644 --- 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 ac8a45f5b..5d333af88 100644 --- 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 a08c65217..06a0dc8a5 100644 --- 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 59c000746..dfcd76f8c 100644 --- 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 8ae660706..658b8ada5 100644 --- 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 fc052e540..0081049cf 100644 --- 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 2cf01eeec..b8fd805a4 100644 --- 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 6ab098667..e9322c3bf 100644 --- 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 c59cdaade..46fc17cec 100644 --- 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 4dbaae829..b2ebb6d9a 100644 --- 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 ec943a857..eb963f155 100644 --- 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 5445a07ea..929a44586 100644 --- 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 7a0cce317..9167ee628 100644 --- 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 50676fc2c..5c01e4b9b 100644 --- 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 1b1dcd048..99df0ec9f 100644 --- 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 52edf879f..55d1d94cd 100644 --- 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 4e03c4b7e..07b55b462 100644 --- 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 0eec95cc4..d00273552 100644 --- 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 19126f89d..5900a3ec0 100644 --- 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 8828a9312..a4a21ba6a 100644 --- 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 fb40f6545..0df357a26 100644 --- 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 7a715cfb8..394a9f6b6 100644 --- 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 4c435f873..793e7c0d4 100644 --- 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