Code Review / fuel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 55a4730) | patch
[NOVCP] Add deploy argument `-N` (experimental) 39/52339/8
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 19 Feb 2018 18:01:56 +0000 (19:01 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 20 Feb 2018 04:38:56 +0000 (05:38 +0100)
commit6744afa3475561a5a4b30d03b6ae655796bfba32
tree7712de4cc5fcfef142cecf37d7748d52d07026c2tree | snapshot
parent55a4730a03b523ced440a82a7e8bd26e156bb714commit | diff
[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 change extends novcp support to all HA scenarios.

Change-Id: I7a80415ac33367ab227ececb4ffb1bc026546d36
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
50 files changed:
ci/deploy.sh diff | blob | history
mcp/config/scenario/.gitignore diff | blob | history
mcp/config/scenario/os-nosdn-nofeature-ha.yaml [deleted file] blob | history
mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 [moved from mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 with 94% similarity] diff | blob | history
mcp/config/scenario/os-nosdn-ovs-ha.yaml [deleted file] blob | history
mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 [new file with mode: 0644] blob
mcp/config/scenario/os-odl-nofeature-ha.yaml [deleted file] blob | history
mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 [new file with mode: 0644] blob
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml diff | blob | history
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] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_novcp.yml diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init_novcp.yml diff | blob | history
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] diff | blob | history
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] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml with 70% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml with 89% similarity] diff | blob | history
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 80% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml with 90% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml with 84% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml with 70% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml with 77% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml with 84% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml with 76% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml with 87% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml with 92% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml.j2 [moved from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml with 89% similarity] diff | blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 [deleted symlink] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml [deleted file] blob | history
mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml [deleted file] blob | history
mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml diff | blob | history
mcp/reclass/nodes/cfg01.mcp-pike-ovs-novcp-ha.local.yml [deleted file] blob | history