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

diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml
new file mode 100644 (file)
index 0000000..8611b02
--- /dev/null
+++ b/mcp/config/scenario/os-odl-sfc-noha.yaml
@@ -0,0 +1,33 @@
+##############################################################################
+# 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
+##############################################################################
+---
+cluster:
+  domain: mcp-odl-noha.local
+  states:
+    - opendaylight
+    - openstack_noha
+    - neutron_gateway
+    - tacker
+    - networks
+virtual:
+  nodes:
+    control:
+      - ctl01
+      - gtw01
+      - odl01
+    compute:
+      - cmp001
+      - cmp002
+  ctl01:
+    vcpus: 4
+    ram: 14336
+  gtw01:
+    ram: 2048
+  odl01:
+    vcpus: 4
+    ram: 5120

diff --git a/mcp/config/states/tacker b/mcp/config/states/tacker
new file mode 100755 (executable)
index 0000000..bd8bc99
--- /dev/null
+++ b/mcp/config/states/tacker
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+##############################################################################
+# 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
+##############################################################################
+
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
+salt -I 'tacker:server' state.sls tacker -b 1

diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
index c983ad7..d8f8569 100644 (file)
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 35 insertions(+), 1 deletion(-)
 
 diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..8fb460d 100644
+index 2c75586..8ac8f81 100644
 --- a/DockerMake.yml
 +++ b/DockerMake.yml
 @@ -102,12 +102,46 @@ salt-formulas:
@@ -33,7 +33,7 @@ index 2c75586..8fb460d 100644
      ARG RECLASS_BASE="/srv/salt/reclass"
      ENV RECLASS_BASE $RECLASS_BASE
 -    RUN echo "Layer python/salt module prerequisites, formulas" \
-+    RUN echo "Layer python/salt module prerequisites, formulas (1 Sep 2018)" \
++    RUN echo "Layer python/salt module prerequisites, formulas (19 Sep 2018)" \
        && mkdir -p /srv/salt \
        && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \
        && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \

diff --git a/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch
index 7c36437..f003c20 100644 (file)
--- a/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch
+++ b/mcp/patches/reclass-system-salt-model/0001-Use-keystone-v3-endpoints-by-default.patch
@@ -20,7 +20,7 @@ Change-Id: I7e9a1b180f4e0ddb24ec72ed9f08c9e2580c7897
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/keystone/client/single.yml b/keystone/client/single.yml
-index ad2d55a1..120a2359 100644
+index b8ab7f1b..98cf359c 100644
 --- a/keystone/client/single.yml
 +++ b/keystone/client/single.yml
 @@ -5,7 +5,7 @@ classes:

diff --git a/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch
similarity index 100%
rename from mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch
rename to mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch

diff --git a/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch
similarity index 100%
rename from mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch
rename to mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch

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
similarity index 97%
rename from mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
rename to mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index dd4b9c4..d1caafe 100644 (file)
--- 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 5aa08ac..875c760 100644 (file)
--- 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
similarity index 92%
rename from mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml
rename to mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 037bf02..d905f7a 100644 (file)
--- 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 %}