add opencontrail 4.0 to docker
Closes-bug: PROD-15803
Change-Id: Ib65137cbe4be7e81614289e24fdc30375d0e4639
diff --git a/docker/client.yml b/docker/client.yml
index df11493..b1be1cb 100644
--- a/docker/client.yml
+++ b/docker/client.yml
@@ -2,7 +2,7 @@
- service.docker.client
parameters:
_param:
- docker_image_compose: docker/compose:1.8.0
+ docker_image_compose: docker/compose:1.17.0
docker:
client:
enabled: true
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index a122830..11ad4d3 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -11,34 +11,28 @@
opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
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
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
- package:
- librdkafka1:
- version: 0.9.0-0contrail0
- hold: true
- python-kafka:
- version: 1.0.1-0contrail1
- hold: true
kernel:
modules:
- nf_conntrack_ipv4
opencontrail:
common:
+ config_only: true
identity:
host: ${_param:openstack_control_address}
network:
host: ${_param:openstack_control_address}
collector:
+ config_only: true
discovery:
host: None
- database:
- members:
- - host: ${_param:opencontrail_analytics_node01_address}
- - host: ${_param:opencontrail_analytics_node02_address}
- - host: ${_param:opencontrail_analytics_node03_address}
analytics:
+ identity:
+ host: ${_param:openstack_control_address}
members:
- host: ${_param:opencontrail_analytics_node01_address}
- host: ${_param:opencontrail_analytics_node02_address}
@@ -55,6 +49,7 @@
- host: ${_param:opencontrail_control_node02_address}
- host: ${_param:opencontrail_control_node03_address}
database:
+ config_only: true
discovery:
host: None
analytics:
@@ -62,3 +57,34 @@
- host: ${_param:opencontrail_analytics_node01_address}
- host: ${_param:opencontrail_analytics_node02_address}
- host: ${_param:opencontrail_analytics_node03_address}
+ docker:
+ client:
+ compose:
+ opencontrail_api:
+ status: up
+ pull: true
+ service:
+ analytics:
+ image: ${_param:opencontrail_analytics_image}
+ network_mode: "host"
+ privileged: true
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /etc/redis/redis.conf:/etc/redis/redis.conf
+ analyticsdb:
+ image: ${_param:opencontrail_analyticsdb_image}
+ volumes:
+ - /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
+ - /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
+ - /etc/contrail:/etc/contrail
+ - /var/lib/analyticsdb:/var/lib/cassandra
+ - /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
+ - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
+ - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
+ - /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
+ - /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ network_mode: "host"
+ privileged: true
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index cd12eef..1ee9ca5 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -12,31 +12,27 @@
opencontrail_message_queue_node02_address: ${_param:openstack_control_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_control_node03_address}
opencontrail_message_queue_address: ${_param:openstack_control_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_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ analytics_vip_address: ${_param:opencontrail_analytics_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
- package:
- librdkafka1:
- version: 0.9.0-0contrail0
- python-kafka:
- version: 1.0.1-0contrail1
kernel:
modules:
- nf_conntrack_ipv4
opencontrail:
common:
+ config_only: true
identity:
host: ${_param:openstack_control_address}
network:
host: ${_param:openstack_control_address}
collector:
+ config_only: true
discovery:
host: None
- database:
- members:
- - host: ${_param:cluster_node01_address}
- - host: ${_param:cluster_node02_address}
- - host: ${_param:cluster_node03_address}
analytics:
members:
- host: ${_param:cluster_node01_address}
@@ -54,6 +50,7 @@
- host: ${_param:cluster_node02_address}
- host: ${_param:cluster_node03_address}
database:
+ config_only: true
discovery:
host: None
analytics:
@@ -62,6 +59,7 @@
- host: ${_param:cluster_node02_address}
- host: ${_param:cluster_node03_address}
config:
+ config_only: true
network:
host: ${_param:openstack_control_address}
bind:
@@ -84,6 +82,7 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
control:
+ config_only: true
analytics:
members:
- host: ${_param:cluster_node01_address}
@@ -102,6 +101,7 @@
discovery:
host: None
web:
+ config_only: true
analytics:
host: ${_param:opencontrail_control_address}
cache:
@@ -109,6 +109,51 @@
identity:
host: ${_param:openstack_control_address}
database:
- port: 9042
+ port: 9041
network:
host: ${_param:openstack_control_address}
+ docker:
+ client:
+ compose:
+ opencontrail_api:
+ status: up
+ pull: true
+ service:
+ controller:
+ image: ${_param:opencontrail_controller_image}
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /var/lib/configdb:/var/lib/cassandra
+ - /var/lib/config_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /etc/cassandra/cassandra-env.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra.yaml:/etc/cassandra/cassandra.yaml
+ - /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
+ network_mode: "host"
+ privileged: true
+ analytics:
+ image: ${_param:opencontrail_analytics_image}
+ network_mode: "host"
+ privileged: true
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /etc/redis/redis.conf:/etc/redis/redis.conf
+ analyticsdb:
+ image: ${_param:opencontrail_analyticsdb_image}
+ volumes:
+ - /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
+ - /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
+ - /etc/contrail:/etc/contrail
+ - /var/lib/analyticsdb:/var/lib/cassandra
+ - /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
+ - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
+ - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
+ - /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
+ - /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ network_mode: "host"
+ privileged: true
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 32b51e5..f1d603c 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -9,13 +9,17 @@
opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
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
+ analytics_vip_address: ${_param:opencontrail_analytics_address}
opencontrail:
common:
+ config_only: true
identity:
host: ${_param:openstack_control_address}
network:
host: ${_param:openstack_control_address}
config:
+ config_only: true
network:
host: ${_param:openstack_control_address}
bind:
@@ -38,6 +42,7 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
control:
+ config_only: true
analytics:
members:
- host: ${_param:opencontrail_analytics_node01_address}
@@ -56,6 +61,7 @@
discovery:
host: None
web:
+ config_only: true
analytics:
host: ${_param:opencontrail_analytics_address}
cache:
@@ -63,10 +69,11 @@
identity:
host: ${_param:openstack_control_address}
database:
- port: 9042
+ port: 9041
network:
host: ${_param:openstack_control_address}
database:
+ config_only: true
analytics:
members:
- host: ${_param:opencontrail_analytics_node01_address}
@@ -77,3 +84,24 @@
kernel:
modules:
- nf_conntrack_ipv4
+ docker:
+ client:
+ compose:
+ opencontrail_api:
+ status: up
+ pull: true
+ service:
+ controller:
+ image: ${_param:opencontrail_controller_image}
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /var/lib/configdb:/var/lib/cassandra
+ - /var/lib/config_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /etc/cassandra/cassandra-env.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra.yaml:/etc/cassandra/cassandra.yaml
+ - /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
+ network_mode: "host"
+ privileged: true
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 365ed20..de6f558 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -5,14 +5,13 @@
_param:
opencontrail_version: 4.0
linux_repo_contrail_component: oc40
+ 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
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
package:
- librdkafka1:
- version: 0.9.0-0contrail0
- python-kafka:
- version: 1.0.1-0contrail1
contrail-api-cli:
version: latest
kernel:
@@ -73,11 +72,13 @@
password: ${_param:opencontrail_stats_password}
opencontrail:
common:
+ config_only: true
identity:
host: ${_param:openstack_control_address}
network:
host: ${_param:openstack_control_address}
config:
+ config_only: true
network:
host: ${_param:openstack_control_address}
bind:
@@ -96,6 +97,7 @@
region: ${_param:openstack_region}
host: ${_param:openstack_control_address}
control:
+ config_only: true
analytics:
members:
- host: ${_param:single_address}
@@ -108,6 +110,7 @@
discovery:
host: None
web:
+ config_only: true
analytics:
host: ${_param:single_address}
cache:
@@ -115,14 +118,16 @@
identity:
host: ${_param:openstack_control_address}
database:
- port: 9042
+ port: 9041
network:
host: ${_param:openstack_control_address}
database:
+ config_only: true
analytics:
members:
- host: ${_param:single_address}
collector:
+ config_only: true
discovery:
host: None
database:
@@ -138,3 +143,48 @@
config:
members:
- host: ${_param:single_address}
+ docker:
+ client:
+ compose:
+ opencontrail_api:
+ status: up
+ pull: true
+ service:
+ controller:
+ image: ${_param:opencontrail_controller_image}
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /var/lib/configdb:/var/lib/cassandra
+ - /var/lib/config_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /etc/cassandra/cassandra-env.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra.yaml:/etc/cassandra/cassandra.yaml
+ - /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
+ network_mode: "host"
+ privileged: true
+ analytics:
+ image: ${_param:opencontrail_analytics_image}
+ network_mode: "host"
+ privileged: true
+ volumes:
+ - /etc/contrail:/etc/contrail
+ - /etc/redis/redis.conf:/etc/redis/redis.conf
+ analyticsdb:
+ image: ${_param:opencontrail_analyticsdb_image}
+ volumes:
+ - /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
+ - /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
+ - /etc/cassandra/logback.xml:/etc/cassandra/logback.xml
+ - /etc/contrail:/etc/contrail
+ - /var/lib/analyticsdb:/var/lib/cassandra
+ - /var/lib/analyticsdb_zookeeper_data:/var/lib/zookeeper
+ - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
+ - /usr/share/kafka/config/server.properties:/usr/share/kafka/config/server.properties
+ - /usr/share/kafka/config/consumer.properties:/usr/share/kafka/config/consumer.properties
+ - /usr/share/kafka/config/zookeeper.properties:/usr/share/kafka/config/zookeeper.properties
+ - /etc/zookeeper/conf/zoo_analytics.cfg:/etc/zookeeper/conf/zoo.cfg
+ - /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
+ network_mode: "host"
+ privileged: true