diff options
author | 2018-03-07 16:36:30 +0000 | |
---|---|---|
committer | 2018-03-07 16:36:30 +0000 | |
commit | d630ceae00b342695e703fc0e7b485e901cb65f3 (patch) | |
tree | c82523aac35c783996d7c4658eac30968e172fab /mcp/reclass/classes/cluster/mcp-pike-ovs-ha | |
parent | 6da4060d054c66f3d0c17cfa885f6bfe171c5121 (diff) | |
parent | a21457cc96a640700736189612261e9bcae3d825 (diff) |
Merge "[novcp] Add deploy argument `-N` (experimental)"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-ha')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml) | 3 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 | 14 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml | 2 |
6 files changed, 20 insertions, 5 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 index 5a44e715a..74023ce14 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 @@ -6,6 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- +{%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-common-ha.infra.kvm - cluster.mcp-pike-ovs-ha.infra +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 new file mode 100644 index 000000000..0d49e5d10 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 @@ -0,0 +1,14 @@ +############################################################################## +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +{%- if conf.MCP_VCP %} +# NOTE(armband): we don't want to pull in salt.control for novcp +classes: + - cluster.mcp-pike-common-ha.infra.kvm + - cluster.mcp-pike-ovs-ha.infra +{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml index de5151c8e..33c86e8c1 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml index 145db8f5f..629b2794b 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml index 032da69e5..3698965f6 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml index b13297c0f..26341ea7b 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-pike-ovs-ha.infra.init_vcp |