summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-02 22:04:20 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-02 22:08:32 +0400
commit0c00f813d709fd1b65e5dd52abcf16fd81b3d0e1 (patch)
tree3fb24c644d3f07169c1883245a7a9013562f9c11 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra
parentfa63bf2a6afe2c2139ae9161fd995d54df70fd68 (diff)
Align salt version & repos
Change-Id: If7cb8473f5c290d1d5f22fce5567f7b8da24fd9f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml1
3 files changed, 1 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index b4cc054a2..d6c3e6cb1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -9,6 +9,7 @@ parameters:
_param:
apt_mk_version: nightly
mcp_repo_version: 1.1
+ salt_version: 2016.11
cluster_name: baremetal-mcp-ocata-ovs-ha
cluster_domain: ${_param:cluster_name}.local
# stacklight_environment: ${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index 9e023e33d..aa3cb4f2a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -2,7 +2,6 @@
classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- - system.linux.system.repo.saltstack.xenial
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index bf5783703..cebc779b1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -1,6 +1,5 @@
---
classes:
- - system.linux.system.repo.saltstack.xenial
- system.maas.region.single
- service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-ha.infra