aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-14 21:45:29 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-14 21:55:06 +0400
commit06c464a9c2aee9cbfa801b2f3842bd0beca62291 (patch)
tree8b8487f2bd8b9067eafc5167c9c03b87d10d33c0 /mcp/reclass
parentfd1f3fa1c8c83b2e5f8cacc6a6caf1a14e40b1a5 (diff)
Get back to salt 2016.11
Change-Id: Id024ed22dd1760f41ae18aeb8e680c2f07a5dc63 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml2
4 files changed, 6 insertions, 2 deletions
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: