From 90a442136b0aff8380388ac0a94831d0904e3cb8 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 14 Sep 2018 13:45:25 +0400 Subject: [PATCH] [noha] Bring in OpenDaylight SFC scenario - bump formulas baseline during docker build; - refresh patches; Change-Id: I0a54863f57344c5f8897dc981f704c4d265c5522 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/os-odl-sfc-noha.yaml | 33 ++++++++++++++++++++++ mcp/config/states/tacker | 12 ++++++++ ...02-OPNFV-package-installation-Ubuntu-user.patch | 4 +-- ...0001-Use-keystone-v3-endpoints-by-default.patch | 2 +- ...system.repo-Drop-arch-for-openstack-repo.patch} | 0 ...ystem.repo-Drop-arch-for-mcp.mirror-repo.patch} | 0 ...nstack_control.yml => openstack_control.yml.j2} | 5 ++++ .../cluster/mcp-common-noha/openstack_init.yml.j2 | 6 ++++ .../opendaylight/{control.yml => control.yml.j2} | 3 ++ 9 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 mcp/config/scenario/os-odl-sfc-noha.yaml create mode 100755 mcp/config/states/tacker rename mcp/patches/reclass-system-salt-model/{0005-linux.system.repo-Drop-arch-for-openstack-repo.patch => 0003-linux.system.repo-Drop-arch-for-openstack-repo.patch} (100%) rename mcp/patches/reclass-system-salt-model/{0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch => 0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch} (100%) rename mcp/reclass/classes/cluster/mcp-common-noha/{openstack_control.yml => openstack_control.yml.j2} (97%) rename mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/{control.yml => control.yml.j2} (92%) diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml new file mode 100644 index 000000000..8611b0261 --- /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 index 000000000..bd8bc9991 --- /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 c983ad728..d8f85691e 100644 --- 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 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 7c36437f6..f003c2031 100644 --- 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 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 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 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 %} -- 2.16.6