summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-07 16:36:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-07 16:36:30 +0000
commitd630ceae00b342695e703fc0e7b485e901cb65f3 (patch)
treec82523aac35c783996d7c4658eac30968e172fab /mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack
parent6da4060d054c66f3d0c17cfa885f6bfe171c5121 (diff)
parenta21457cc96a640700736189612261e9bcae3d825 (diff)
Merge "[novcp] Add deploy argument `-N` (experimental)"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml)4
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml2
5 files changed, 6 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
index c6a28c3bc..69cb24dbf 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-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-odl-ha.infra
+ - cluster.mcp-pike-odl-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2
index a5e63b060..5a3b36fb1 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2
@@ -11,11 +11,10 @@ classes:
parameters:
_param:
# opendaylight options
- opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
- opendaylight_server_node01_hostname: odl01
neutron_tenant_network_types: "flat,vxlan"
+{%- if conf.MCP_VCP %}
linux:
network:
host:
@@ -24,3 +23,4 @@ parameters:
names:
- ${_param:opendaylight_server_node01_hostname}
- ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain}
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
index 13596155c..604728da1 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-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-odl-ha.infra
+ - cluster.mcp-pike-odl-ha.infra.init_vcp
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
index e2040aa3a..cd1ae9040 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
@@ -9,7 +9,7 @@
classes:
- cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
- cluster.mcp-pike-common-ha.openstack_proxy
- - cluster.mcp-pike-odl-ha.infra
+ - cluster.mcp-pike-odl-ha.infra.init_vcp
parameters:
nginx:
server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
index 13e6ef6d4..20df2aab6 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-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-odl-ha.infra
+ - cluster.mcp-pike-odl-ha.infra.init_vcp