[novcp] Add deploy argument `-N` (experimental) 39/52339/25
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 19 Feb 2018 18:01:56 +0000 (19:01 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 7 Mar 2018 03:16:29 +0000 (04:16 +0100)
commita21457cc96a640700736189612261e9bcae3d825
tree386c1276f5c07f72d8e74412000ced3d3a9d3ad8
parent256e2a50b9b340bb78a8c85fdd7cacf96d0fb637
[novcp] Add deploy argument `-N` (experimental)

Instead of duplicating scenarios for NOVCP, allow it to be specified
using a new deploy argument, `-N`.

Things are getting convoluted, so instead of creating dedicated
'*_pdf.yml.j2' files for each group of similar features, apply the
templating in-place and rename all affected files to ".yml.j2".

This breaks .gitignore assumption of hiding only "*_pdf.yml" files,
so extend (manually) the <mcp/reclass/classes/cluster/.gitignore>
with `git ls-files --exclude-standard -o` after an expansion.

- ha: move nfv.cpu_pinning to j2, conditioned by 'baremetal';
- ha: add cmp00* vnode definitions (hugepages need more RAM);
- labs/local: enable hugepage params for non-dpdk noha;
- salt.sh: add route_wrapper to all non-infra VMs;

This change extends novcp support to all HA scenarios.

Change-Id: I7a80415ac33367ab227ececb4ffb1bc026546d36
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
64 files changed:
ci/deploy.sh
mcp/config/labs/local/idf-virtual1.yaml
mcp/config/scenario/.gitignore
mcp/config/scenario/os-nosdn-nofeature-ha.yaml [deleted file]
mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 [moved from mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 with 90% similarity]
mcp/config/scenario/os-nosdn-ovs-ha.yaml [deleted file]
mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 [new file with mode: 0644]
mcp/config/scenario/os-odl-nofeature-ha.yaml [deleted file]
mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 [new file with mode: 0644]
mcp/config/scenario/os-ovn-nofeature-ha.yaml [deleted file]
mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 [new file with mode: 0644]
mcp/reclass/classes/cluster/.gitignore
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml with 92% similarity]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_novcp.yml with 84% similarity]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml with 77% similarity]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init_novcp.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml with 96% similarity]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml with 97% similarity]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml with 63% similarity]
mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml with 87% similarity]
mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml with 91% similarity]
mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml with 96% similarity]
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml with 86% similarity]
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init_vcp.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml with 92% similarity]
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml with 81% similarity]
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml with 92% similarity]
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 [new file with mode: 0644]
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml with 92% similarity]
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 [new file with mode: 0644]
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 [deleted symlink]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml [deleted file]
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml [deleted file]
mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
mcp/reclass/nodes/cfg01.mcp-pike-ovs-novcp-ha.local.yml [deleted file]
mcp/scripts/salt.sh
mcp/scripts/xdf_data.sh.j2