[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>

2 files changed, 11 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}