From 0c00f813d709fd1b65e5dd52abcf16fd81b3d0e1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 2 Oct 2017 22:04:20 +0400 Subject: Align salt version & repos Change-Id: If7cb8473f5c290d1d5f22fce5567f7b8da24fd9f Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 1 + mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 1 - mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 1 - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 1 - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 1 - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 1 - .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml | 1 - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 1 - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 1 - 9 files changed, 1 insertion(+), 8 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha') 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 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index ff97fe819..a6fd289f5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index f0c03cc0e..5d796eb82 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.ceilometer.client - system.memcached.server.single - system.keystone.server.cluster diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index b8a43d814..7346f5545 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.galera.server.cluster - system.galera.server.database.aodh - system.galera.server.database.ceilometer diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 66b58221c..083cf7566 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.rabbitmq.server.cluster - system.rabbitmq.server.vhost.openstack - cluster.baremetal-mcp-ocata-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index e948d93ad..6e0479355 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.nginx.server.single - system.nginx.server.proxy.openstack_api - system.nginx.server.proxy.openstack_vnc diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index 4389a4918..8254d97af 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -2,7 +2,6 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial - system.mongodb.server.cluster - system.mongodb.server.database.ceilometer - system.ceilometer.server.backend.mongodb -- cgit 1.2.3-korg