Merge "[infra] Bind mas01 mcpcontrol DHCP to MAAS_IP"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / infra / init.yml.j2

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 0edc6bd..59d75d4 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
@@ -7,15 +7,14 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.single
   - cluster.all-mcp-arch-common
   # - cluster.mcp-common-ha.stacklight
   # - cluster.mcp-common-ha.stacklight.client
 parameters:
   _param:
-    apt_mk_version: testing
+    apt_mk_version: nightly
     mcp_repo_version: 1.1
-    salt_version: 2016.11
+    salt_version: 2017.7
     cluster_domain: ${_param:cluster_name}.local
     # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
@@ -72,6 +71,8 @@ parameters:
         config:
           prefer_ipv4:
             Acquire::ForceIPv4: true
+          allow_downgrades:
+            APT::Get::allow-downgrades: true
       user:
         ubuntu:
           enabled: true