From 06c464a9c2aee9cbfa801b2f3842bd0beca62291 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 14 Jun 2018 21:45:29 +0400 Subject: Get back to salt 2016.11 Change-Id: Id024ed22dd1760f41ae18aeb8e680c2f07a5dc63 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/defaults.yaml | 8 ++++---- mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml | 2 ++ mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 | 2 +- mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml | 2 +- mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml | 2 ++ mcp/salt-formulas/opendaylight/server.sls | 8 ++++++++ mcp/scripts/salt.sh | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) (limited to 'mcp') diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 283ffc542..dff018f72 100644 --- a/mcp/config/scenario/defaults.yaml +++ b/mcp/config/scenario/defaults.yaml @@ -14,10 +14,10 @@ x86_64: common: apt: keys: - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub repos: # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main pkg: install: - linux-generic-hwe-16.04 @@ -36,10 +36,10 @@ aarch64: apt: keys: - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub repos: # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main pkg: install: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml index f626ecea4..06c4ebd15 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml @@ -67,6 +67,8 @@ parameters: master: accept_policy: open_mode file_recv: true + worker_threads: 4 + command_timeout: 20 reclass: storage: data_source: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 index d4927428f..8c601f61b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 @@ -15,7 +15,7 @@ parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 - salt_version: 2017.7 + salt_version: 2016.11 cluster_domain: ${_param:cluster_name}.local # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml index 8c8f4f659..36c674b85 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml @@ -42,7 +42,7 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} cluster: - saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main" + saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" linux: network: interface: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml index 00f3b76ab..22bf6d8b1 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml @@ -54,6 +54,8 @@ parameters: salt: master: file_recv: true + worker_threads: 2 + command_timeout: 20 reclass: storage: data_source: diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index edacc7855..5f53e6a18 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -32,9 +32,15 @@ opendaylight_repo: - name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main - file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list +{%- if grains['saltversioninfo'] < [2017, 7] %} +service.mask: + module.run: + - m_name: opendaylight +{%- else %} opendaylight_service_mask: service.masked: - name: opendaylight +{%- endif %} opendaylight: pkg.installed: @@ -47,7 +53,9 @@ opendaylight: - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg service.running: - enable: true +{%- if grains['saltversioninfo'] >= [2017, 7] %} - unmask: true +{%- endif %} - watch: - file: /opt/opendaylight/etc/jetty.xml - file: /opt/opendaylight/bin/setenv diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index e6a589e62..fae644e07 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -80,7 +80,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END export DEBIAN_FRONTEND=noninteractive echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true - BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2017.7 " \ + BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \ EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \ ./salt-master-init.sh -- cgit 1.2.3-korg