Merge "Bump virtlet to v1.1.1"
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 66aea6d..d442693 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -19,4 +19,5 @@
host: ${_param:single_address}
identity:
protocol: ${_param:internal_protocol}
+ region: ${_param:openstack_region}
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 794a33e..d03d6f7 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -12,3 +12,4 @@
host: ${_param:single_address}
identity:
host: ${_param:single_address}
+ region: ${_param:openstack_region}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index b959d32..f66a190 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -25,3 +25,4 @@
identity:
host: ${_param:openstack_control_address}
protocol: ${_param:cluster_internal_protocol}
+ region: ${_param:openstack_region}
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 0f60c76..d36d725 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -48,6 +48,12 @@
branches: ${_param:contrail_dpdk_branches}
- name: contrail-third-party-cache-fixup
branches: ${_param:contrail_third_party_cache_fixup_branches}
+ - name: contrail-common
+ branches: ${_param:oc5_branches}
+ - name: contrail-analytics
+ branches: ${_param:oc5_branches}
+ - name: contrail-api-client
+ branches: ${_param:oc5_branches}
template:
discard:
build: