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/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