Add container names for OC40
Change-Id: I84d911979b33aae68bfb6caa3e324e6536b576e5
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index c38e06a..4ec9b4c 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -15,6 +15,8 @@
opencontrail_message_queue_address: ${_param:openstack_message_queue_address}
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -68,12 +70,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -81,6 +84,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 92a6a17..611eb24 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -17,6 +17,9 @@
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
@@ -125,12 +128,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -145,6 +149,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -152,6 +157,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index f1d603c..2fe76e8 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -10,6 +10,7 @@
opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
opencontrail:
common:
@@ -87,12 +88,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a9ae787..fcbd6af 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -10,6 +10,9 @@
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -156,12 +159,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -176,6 +180,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -183,6 +188,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml