Merge "Fixed gerrit triggering in mirror jobs"
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 0a3127c..8e61e8e 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -3,8 +3,8 @@
parameters:
_param:
jenkins_deploy_jobs:
- - stack_name: virtual_mcp11_contrail
- stack_env: devcloud_virtual_mcp11_contrail
+ - stack_name: virtual_mcp_contrail
+ stack_env: devcloud_mcp11_contrail
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
diff --git a/opencontrail/client/resource/llgr.yml b/opencontrail/client/resource/llgr.yml
new file mode 100644
index 0000000..aff3ffb
--- /dev/null
+++ b/opencontrail/client/resource/llgr.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ opencontrail_gsc_grp_enable: True
+ opencontrail_gsc_grp_restart_time: 60
+ opencontrail_gsc_grp_end_of_rib_timeout: 30
+ opencontrail_gsc_grp_bgp_helper_enable: False
+ opencontrail_gsc_grp_xmpp_helper_enable: False
+ opencontrail_gsc_grp_long_lived_restart_time: 300
+ opencontrail:
+ client:
+ global_system_config:
+ grp:
+ enable: ${_param:opencontrail_gsc_grp_enable}
+ restart_time: ${_param:opencontrail_gsc_grp_restart_time}
+ end_of_rib_timeout: ${_param:opencontrail_gsc_grp_end_of_rib_timeout}
+ bgp_helper_enable: ${_param:opencontrail_gsc_grp_bgp_helper_enable}
+ xmpp_helper_enable: ${_param:opencontrail_gsc_grp_xmpp_helper_enable}
+ long_lived_restart_time: ${_param:opencontrail_gsc_grp_long_lived_restart_time}
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index 4ec9b4c..ed7e99e 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -79,6 +79,7 @@
container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
@@ -101,3 +102,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 611eb24..17aef3a 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -147,11 +147,13 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
analytics:
image: ${_param:opencontrail_analytics_image}
container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
@@ -174,3 +176,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 2fe76e8..c20652c 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -107,3 +107,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index fcbd6af..4fcdf04 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -178,11 +178,13 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always
analytics:
image: ${_param:opencontrail_analytics_image}
container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
+ restart: always
volumes:
- /etc/contrail:/etc/contrail
- /etc/redis/redis.conf:/etc/redis/redis.conf
@@ -205,3 +207,4 @@
- /etc/zookeeper/conf/log4j.properties:/etc/zookeeper/conf/log4j.properties
network_mode: "host"
privileged: true
+ restart: always