Move ocata-ovs and ocata-ovs-ceph model to build_id use
Change-Id: If5b6a6ecb5cb22e21166a5def08d511b50ed34e0
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml
index caed3db..f8d4991 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml
@@ -1,3 +1,3 @@
classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- cluster.virtual-mcp-ocata-ovs-ceph
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
index b11114b..1335900 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
ceph:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
index 65908f9..bfa27fe 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
@@ -1,7 +1,7 @@
classes:
- system.ceph.mon.cluster
- system.ceph.mgr.cluster
-- system.linux.system.repo.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
linux:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
index 3a26d46..ebe0acd 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
@@ -1,6 +1,6 @@
classes:
- service.ceph.osd.cluster
-- system.linux.system.repo.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
linux:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index c1afc30..434c89e 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -2,8 +2,8 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
index c210cb8..94abc3b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
@@ -1,7 +1,7 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
index f57ebca..73ed586 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -1,9 +1,9 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml
index f6c2bbd..c751725 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml
@@ -1,8 +1,8 @@
classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.horizon.server.single
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
index dc29f34..219e8f5 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
@@ -1,7 +1,7 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.neutron.gateway.cluster
- cluster.virtual-mcp-ocata-ovs-ceph
parameters:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml
index f12bbc7..14537e0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml
@@ -2,7 +2,6 @@
_param:
openstack_version: ocata
apt_mk_version: nightly
- mcp_repo_version: 1.1
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
index 1f95bb9..9b08d06 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
@@ -1,10 +1,9 @@
classes:
- system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.docker
- system.heka.remote_collector.container
- system.heka.remote_collector.input.amqp
- system.heka.remote_collector.output.elasticsearch
@@ -46,14 +45,14 @@
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
cluster_node03_hostname: mon03
cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
- docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
- docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
- docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
- docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
- docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
- docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
+ docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
+ docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
+ docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
+ docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
+ docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
+ docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
+ docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
+ docker_image_grafana: docker-prod-local.artifactory.mirantis.com/mirantis/external/grafana:${_param:apt_mk_version}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass