aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-03 17:43:43 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-03 18:39:31 +0100
commit7804d3d7d42277d9616afcd6cbef9fa70155b470 (patch)
tree88cf36a9ebe07664abbf6fae3437a7768a232a60
parented209426e895c7c323d253afd6276bb74df64da0 (diff)
[baremetal] curtin: Bump salt-minion to 2016.11
By default, MaaS formula will install Salt minion 2016.3 via curtin on physical nodes. 2016.3 does not properly support proxy_host config option, causing timeouts during `linux.system.repo` SLS apply. Change-Id: I3d6245f0d4b425170c43b3b62a21ad9acc6cb97e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6e0e518d43cecfb8f981dbd51326d8eae103720c)
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
index 7a37fe74b..04ffdb44d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
@@ -109,6 +109,8 @@ parameters:
architecture: ${_param:opnfv_maas_node05_architecture}
distro_series: xenial
hwe_kernel: ${_param:hwe_kernel}
+ cluster:
+ saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main"
linux:
network:
interface: