aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-14 13:45:25 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-19 14:15:54 +0200
commit90a442136b0aff8380388ac0a94831d0904e3cb8 (patch)
treefc94d1128a08f69e47699f60ac8bb36262a502e3 /mcp/reclass/classes/cluster
parent6f1993bdcec38c4320f0c4d6488d68fcf4f8dda5 (diff)
[noha] Bring in OpenDaylight SFC scenario
- bump formulas baseline during docker build; - refresh patches; Change-Id: I0a54863f57344c5f8897dc981f704c4d265c5522 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml)5
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j26
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml)3
3 files changed, 14 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index dd4b9c4f5..d1caafe45 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -63,6 +63,11 @@ classes:
- system.apache.server.single
- system.horizon.server.single
- service.haproxy.proxy.single
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+ - system.keystone.client.service.tacker
+ - system.galera.server.database.tacker
+ - service.tacker.server.single
+{%- endif %}
- cluster.mcp-common-noha.haproxy_openstack_api
- cluster.mcp-common-noha.openstack_control_pdf
parameters:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 5aa08ac9f..875c7603b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -93,6 +93,12 @@ parameters:
barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
barbican_integration_enabled: true
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+ tacker_service_host: ${_param:cluster_local_address}
+ keystone_tacker_password: opnfv_secret
+ mysql_tacker_password: opnfv_secret
+{%- endif %}
+
aodh_version: ${_param:openstack_version}
keystone_aodh_password: opnfv_secret
aodh_service_host: ${_param:cluster_local_address}
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 037bf0248..d905f7ad6 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -29,3 +29,6 @@ parameters:
- odl-aaa-authn
netvirt:
- odl-netvirt-openstack
+{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
+ - odl-netvirt-sfc
+{%- endif %}