From 90a442136b0aff8380388ac0a94831d0904e3cb8 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 14 Sep 2018 13:45:25 +0400 Subject: [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 | 40 ++++ ...system.repo-Drop-arch-for-mcp.mirror-repo.patch | 39 ++++ ....system.repo-Drop-arch-for-openstack-repo.patch | 40 ---- ...system.repo-Drop-arch-for-mcp.mirror-repo.patch | 39 ---- .../cluster/mcp-common-noha/openstack_control.yml | 200 -------------------- .../mcp-common-noha/openstack_control.yml.j2 | 205 +++++++++++++++++++++ .../cluster/mcp-common-noha/openstack_init.yml.j2 | 6 + .../cluster/mcp-odl-noha/opendaylight/control.yml | 31 ---- .../mcp-odl-noha/opendaylight/control.yml.j2 | 34 ++++ 13 files changed, 372 insertions(+), 313 deletions(-) create mode 100644 mcp/config/scenario/os-odl-sfc-noha.yaml create mode 100755 mcp/config/states/tacker create mode 100644 mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch create mode 100644 mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch delete mode 100644 mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch delete mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 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/0003-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 new file mode 100644 index 000000000..1da4a2124 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-openstack-repo.patch @@ -0,0 +1,40 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Wed, 4 Apr 2018 20:08:55 +0200 +Subject: [PATCH] linux.system.repo: Drop arch for openstack repo + +Now that mcp-repos mirror has arm64 packages too, we can either extend +the current architecture list or just drop it and let APT figure it +out. + +Extending the arch list to 'amd64,arm64' would lead to doubling repo +metadata downloads on all archs, while dropping it will allow APT to +only download the repo metadata for the current system arch. + +To keep old behavior for amd64 and prevent multiple downloads, let's +just drop the 'architectures' field. + +Signed-off-by: Alexandru Avadanii +--- + linux/system/repo/mcp/openstack.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml +index 465b75d0..8de17774 100644 +--- a/linux/system/repo/mcp/openstack.yml ++++ b/linux/system/repo/mcp/openstack.yml +@@ -7,7 +7,6 @@ parameters: + repo: + mirantis_openstack: + source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" +- architectures: amd64 + key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" + pin: + - pin: 'release l=${_param:openstack_version}' diff --git a/mcp/patches/reclass-system-salt-model/0004-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 new file mode 100644 index 000000000..b2337bcf3 --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch @@ -0,0 +1,39 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Thu, 7 Jun 2018 21:19:07 +0200 +Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo + +Extending the arch list to 'amd64,arm64' would lead to doubling repo +metadata downloads on all archs, while dropping it will allow APT to +only download the repo metadata for the current system arch. + +Setting the new linux_system_architectures is also problematic in the +context of mixed-architecture clusters. + +To keep old behavior for amd64 and prevent multiple downloads, let's +just drop the 'architectures' field. + +Signed-off-by: Alexandru Avadanii +--- + linux/system/repo/mcp/mirror/v1/openstack.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml +index a4a369b2..933bf53a 100644 +--- a/linux/system/repo/mcp/mirror/v1/openstack.yml ++++ b/linux/system/repo/mcp/mirror/v1/openstack.yml +@@ -7,7 +7,6 @@ parameters: + repo: + mirantis_openstack: + source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" +- architectures: ${_param:linux_system_architecture} + clean_file: true + key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key + pin: 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/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch deleted file mode 100644 index 1da4a2124..000000000 --- a/mcp/patches/reclass-system-salt-model/0005-linux.system.repo-Drop-arch-for-openstack-repo.patch +++ /dev/null @@ -1,40 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Wed, 4 Apr 2018 20:08:55 +0200 -Subject: [PATCH] linux.system.repo: Drop arch for openstack repo - -Now that mcp-repos mirror has arm64 packages too, we can either extend -the current architecture list or just drop it and let APT figure it -out. - -Extending the arch list to 'amd64,arm64' would lead to doubling repo -metadata downloads on all archs, while dropping it will allow APT to -only download the repo metadata for the current system arch. - -To keep old behavior for amd64 and prevent multiple downloads, let's -just drop the 'architectures' field. - -Signed-off-by: Alexandru Avadanii ---- - linux/system/repo/mcp/openstack.yml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml -index 465b75d0..8de17774 100644 ---- a/linux/system/repo/mcp/openstack.yml -+++ b/linux/system/repo/mcp/openstack.yml -@@ -7,7 +7,6 @@ parameters: - repo: - mirantis_openstack: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" -- architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release l=${_param:openstack_version}' 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/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch deleted file mode 100644 index b2337bcf3..000000000 --- a/mcp/patches/reclass-system-salt-model/0006-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch +++ /dev/null @@ -1,39 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Thu, 7 Jun 2018 21:19:07 +0200 -Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo - -Extending the arch list to 'amd64,arm64' would lead to doubling repo -metadata downloads on all archs, while dropping it will allow APT to -only download the repo metadata for the current system arch. - -Setting the new linux_system_architectures is also problematic in the -context of mixed-architecture clusters. - -To keep old behavior for amd64 and prevent multiple downloads, let's -just drop the 'architectures' field. - -Signed-off-by: Alexandru Avadanii ---- - linux/system/repo/mcp/mirror/v1/openstack.yml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml -index a4a369b2..933bf53a 100644 ---- a/linux/system/repo/mcp/mirror/v1/openstack.yml -+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml -@@ -7,7 +7,6 @@ parameters: - repo: - mirantis_openstack: - source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" -- architectures: ${_param:linux_system_architecture} - clean_file: true - key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key - pin: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml deleted file mode 100644 index dd4b9c4f5..000000000 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ /dev/null @@ -1,200 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -classes: - - system.linux.system.lowmem - - system.linux.system.repo.mcp.openstack - - service.nfs.server - - system.ceilometer.client - - system.ceilometer.client.neutron - - system.memcached.server.single - - system.rabbitmq.server.single - - system.rabbitmq.server.vhost.openstack - - system.keystone.server.wsgi - - system.keystone.server.single - - system.keystone.client.single - - system.keystone.client.v3.service.keystone - - system.keystone.client.service.nova21 - - system.keystone.client.service.nova-placement - - system.keystone.client.service.cinder3 - - system.keystone.client.service.ceilometer - - system.keystone.client.service.aodh - - system.keystone.client.service.gnocchi - - system.keystone.client.service.panko - - system.keystone.client.service.barbican - - system.glance.control.single - - system.nova.control.single - - system.cinder.control.single - - system.cinder.control.backend.lvm - - system.heat.server.single - - service.mysql.server.single - - system.galera.server.database.cinder - - system.galera.server.database.glance - - system.galera.server.database.grafana - - system.galera.server.database.heat - - system.galera.server.database.keystone - - system.galera.server.database.nova - - system.galera.server.database.ceilometer - - system.galera.server.database.aodh - - system.galera.server.database.gnocchi - - system.galera.server.database.panko - - system.galera.server.database.barbican - - system.barbican.server.single - - service.barbican.server.plugin.simple_crypto - - service.redis.server.single - - service.ceilometer.server.single - - system.ceilometer.server.coordination.redis - - system.ceilometer.server.backend.default - - system.aodh.server.single - - system.aodh.server.coordination.redis - - system.gnocchi.server.single - - system.gnocchi.common.storage.incoming.redis - - system.gnocchi.common.storage.redis - - system.gnocchi.common.coordination.redis - - service.panko.server.single - - system.apache.server.site.gnocchi - - system.apache.server.site.panko - - system.apache.server.site.barbican - - system.apache.server.single - - system.horizon.server.single - - service.haproxy.proxy.single - - cluster.mcp-common-noha.haproxy_openstack_api - - cluster.mcp-common-noha.openstack_control_pdf -parameters: - _param: - interface_mtu: 9000 - linux_system_codename: xenial - ceilometer_create_gnocchi_resources: 'True' - barbican_integration_enabled: 'false' - linux: - system: - package: - python-msgpack: - version: latest - keystone: - server: - admin_email: ${_param:admin_email} - openrc_extra: - volume_device_name: vdc - pkgs: - - keystone - - python-psycopg2 - - python-mysqldb - - python-openstackclient - - python-tornado - client: - enabled: true - resources: - v3: - enabled: true - server: - identity: - admin: - api_version: 3 - admin_identity: - admin: - api_version: '' - user_domain_name: 'Default' - project_domain_name: 'Default' - glance: - server: - storage: - engine: file - images: [] - workers: 1 - barbican: - enabled: ${_param:barbican_integration_enabled} - cinder: - controller: - barbican: - enabled: ${_param:barbican_integration_enabled} - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 - barbican: - enabled: ${_param:barbican_integration_enabled} - horizon: - server: - # yamllint disable-line rule:truthy - secure: False - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} - key_buffer: 8 - max_allowed_packet: 128 - max_connections: 2048 - thread_stack: 512 - thread_cache_size: 12 - query_cache_limit: 2 - query_cache_size: 0 - ceilometer: - server: - ~database: ~ - redis: - server: - version: 3.0 - appendfsync: 'no' - bind: - address: ${_param:single_address} - nfs: - server: - share: - nova_instances: - path: /srv/nova/instances - host: - nova: - host: ${_param:single_address}/${_param:opnfv_net_mgmt_mask} - params: - - rw - - no_root_squash - - async - neutron: - server: - vlan_aware_vms: true - root_helper_daemon: false - global_physnet_mtu: 9000 - backend: - external_mtu: 9000 - apache: - server: - bind: - listen_default_ports: false - site: - gnocchi: &wsgi_threads - wsgi: - threads: 1 - barbican: - <<: *wsgi_threads - barbican_admin: - <<: *wsgi_threads - barbican: - server: - ks_notifications_enable: true - store: - software: - crypto_plugin: simple_crypto - store_plugin: store_crypto - global_default: true diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 new file mode 100644 index 000000000..d1caafe45 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -0,0 +1,205 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - system.linux.system.lowmem + - system.linux.system.repo.mcp.openstack + - service.nfs.server + - system.ceilometer.client + - system.ceilometer.client.neutron + - system.memcached.server.single + - system.rabbitmq.server.single + - system.rabbitmq.server.vhost.openstack + - system.keystone.server.wsgi + - system.keystone.server.single + - system.keystone.client.single + - system.keystone.client.v3.service.keystone + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.cinder3 + - system.keystone.client.service.ceilometer + - system.keystone.client.service.aodh + - system.keystone.client.service.gnocchi + - system.keystone.client.service.panko + - system.keystone.client.service.barbican + - system.glance.control.single + - system.nova.control.single + - system.cinder.control.single + - system.cinder.control.backend.lvm + - system.heat.server.single + - service.mysql.server.single + - system.galera.server.database.cinder + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.ceilometer + - system.galera.server.database.aodh + - system.galera.server.database.gnocchi + - system.galera.server.database.panko + - system.galera.server.database.barbican + - system.barbican.server.single + - service.barbican.server.plugin.simple_crypto + - service.redis.server.single + - service.ceilometer.server.single + - system.ceilometer.server.coordination.redis + - system.ceilometer.server.backend.default + - system.aodh.server.single + - system.aodh.server.coordination.redis + - system.gnocchi.server.single + - system.gnocchi.common.storage.incoming.redis + - system.gnocchi.common.storage.redis + - system.gnocchi.common.coordination.redis + - service.panko.server.single + - system.apache.server.site.gnocchi + - system.apache.server.site.panko + - system.apache.server.site.barbican + - 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: + _param: + interface_mtu: 9000 + linux_system_codename: xenial + ceilometer_create_gnocchi_resources: 'True' + barbican_integration_enabled: 'false' + linux: + system: + package: + python-msgpack: + version: latest + keystone: + server: + admin_email: ${_param:admin_email} + openrc_extra: + volume_device_name: vdc + pkgs: + - keystone + - python-psycopg2 + - python-mysqldb + - python-openstackclient + - python-tornado + client: + enabled: true + resources: + v3: + enabled: true + server: + identity: + admin: + api_version: 3 + admin_identity: + admin: + api_version: '' + user_domain_name: 'Default' + project_domain_name: 'Default' + glance: + server: + storage: + engine: file + images: [] + workers: 1 + barbican: + enabled: ${_param:barbican_integration_enabled} + cinder: + controller: + barbican: + enabled: ${_param:barbican_integration_enabled} + nova: + controller: + networking: dvr + cpu_allocation: 54 + metadata: + password: ${_param:metadata_password} + bind: + private_address: ${_param:cluster_local_address} + public_address: ${_param:cluster_vip_address} + novncproxy_port: 6080 + vncproxy_url: http://${_param:cluster_vip_address}:6080 + workers: 1 + barbican: + enabled: ${_param:barbican_integration_enabled} + horizon: + server: + # yamllint disable-line rule:truthy + secure: False + heat: + server: + bind: + api_cfn: + address: ${_param:single_address} + api_cloudwatch: + address: ${_param:single_address} + mysql: + server: + version: '5.7' + bind: + address: ${_param:cluster_local_address} + key_buffer: 8 + max_allowed_packet: 128 + max_connections: 2048 + thread_stack: 512 + thread_cache_size: 12 + query_cache_limit: 2 + query_cache_size: 0 + ceilometer: + server: + ~database: ~ + redis: + server: + version: 3.0 + appendfsync: 'no' + bind: + address: ${_param:single_address} + nfs: + server: + share: + nova_instances: + path: /srv/nova/instances + host: + nova: + host: ${_param:single_address}/${_param:opnfv_net_mgmt_mask} + params: + - rw + - no_root_squash + - async + neutron: + server: + vlan_aware_vms: true + root_helper_daemon: false + global_physnet_mtu: 9000 + backend: + external_mtu: 9000 + apache: + server: + bind: + listen_default_ports: false + site: + gnocchi: &wsgi_threads + wsgi: + threads: 1 + barbican: + <<: *wsgi_threads + barbican_admin: + <<: *wsgi_threads + barbican: + server: + ks_notifications_enable: true + store: + software: + crypto_plugin: simple_crypto + store_plugin: store_crypto + global_default: true 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 deleted file mode 100644 index 037bf0248..000000000 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - service.opendaylight.server.single - - cluster.mcp-odl-noha - - cluster.mcp-odl-noha.opendaylight.control_pdf -parameters: - _param: - interface_mtu: 1500 - linux_system_codename: xenial - opendaylight: - server: - odl_bind_ip: ${_param:single_address} - odl_rest_port: ${_param:opendaylight_rest_port} - java_min_mem: 3g - java_max_mem: 3g - router_enabled: true - karaf_features: - odl_default: - - odl-restconf-all - - odl-aaa-authn - netvirt: - - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 new file mode 100644 index 000000000..d905f7ad6 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 @@ -0,0 +1,34 @@ +############################################################################## +# 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 +############################################################################## +--- +classes: + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.opendaylight.server.single + - cluster.mcp-odl-noha + - cluster.mcp-odl-noha.opendaylight.control_pdf +parameters: + _param: + interface_mtu: 1500 + linux_system_codename: xenial + opendaylight: + server: + odl_bind_ip: ${_param:single_address} + odl_rest_port: ${_param:opendaylight_rest_port} + java_min_mem: 3g + java_max_mem: 3g + router_enabled: true + karaf_features: + odl_default: + - odl-restconf-all + - odl-aaa-authn + netvirt: + - odl-netvirt-openstack +{%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %} + - odl-netvirt-sfc +{%- endif %} -- cgit 1.2.3-korg