Add Contrail UID/GID to docker-compose
Change-Id: I7fd1f499babc159dbb46c9f6222efb274e29a39b
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index cd7b8cc..88abb7f 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -85,6 +85,10 @@
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analytics:/var/log/journal
+ env_file:
+ - contrail.env
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
container_name: ${_param:opencontrail_analyticsdb_container_name}
@@ -102,6 +106,10 @@
- /usr/share/kafka/logs:/usr/share/kafka/logs
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analyticsdb:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env
\ No newline at end of file
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 71c69b6..05cf7d6 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -146,9 +146,13 @@
- /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
- /etc/zookeeper/conf/zoo.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-controller:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env
analytics:
image: ${_param:opencontrail_analytics_image}
container_name: ${_param:opencontrail_analytics_container_name}
@@ -158,6 +162,10 @@
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analytics:/var/log/journal
+ env_file:
+ - contrail.env
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
container_name: ${_param:opencontrail_analyticsdb_container_name}
@@ -175,6 +183,10 @@
- /usr/share/kafka/logs:/usr/share/kafka/logs
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analyticsdb:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index e660e13..932a789 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -107,6 +107,10 @@
- /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
- /etc/zookeeper/conf/zoo.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-controller:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index d4069e0..4570e69 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -178,9 +178,13 @@
- /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
- /etc/zookeeper/conf/zoo.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-controller:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env
analytics:
image: ${_param:opencontrail_analytics_image}
container_name: ${_param:opencontrail_analytics_container_name}
@@ -190,6 +194,10 @@
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analytics:/var/log/journal
+ env_file:
+ - contrail.env
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
container_name: ${_param:opencontrail_analyticsdb_container_name}
@@ -207,6 +215,10 @@
- /usr/share/kafka/logs:/usr/share/kafka/logs
- /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ - /var/log/contrail:/var/log/contrail
+ - /var/log/journal/contrail-analyticsdb:/var/log/journal
network_mode: "host"
privileged: true
restart: always
+ env_file:
+ - contrail.env