Merge "openstack ovs ceph jenkins job"
diff --git a/jenkins/client/job/git-mirrors/upstream/oss.yml b/jenkins/client/job/git-mirrors/upstream/oss.yml
index af3f816..57ce1a2 100644
--- a/jenkins/client/job/git-mirrors/upstream/oss.yml
+++ b/jenkins/client/job/git-mirrors/upstream/oss.yml
@@ -7,3 +7,7 @@
downstream: oss/rundeck-cis-jobs
upstream: "git@github.com:Mirantis/rundeck-cis-jobs"
branches: master
+ - name: security-monkey
+ downstream: oss/security-monkey
+ upstream: "git@github.com:Netflix/security_monkey.git"
+ branches: develop
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index 11ad4d3..a426e02 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -30,9 +30,9 @@
config_only: true
discovery:
host: None
+ identity:
+ host: ${_param:openstack_control_address}
analytics:
- identity:
- host: ${_param:openstack_control_address}
members:
- host: ${_param:opencontrail_analytics_node01_address}
- host: ${_param:opencontrail_analytics_node02_address}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 1ee9ca5..9796930 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -83,6 +83,8 @@
host: ${_param:openstack_control_address}
control:
config_only: true
+ identity:
+ host: ${_param:openstack_control_address}
analytics:
members:
- host: ${_param:cluster_node01_address}
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index de6f558..ded5289 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -128,6 +128,8 @@
- host: ${_param:single_address}
collector:
config_only: true
+ identity:
+ host: ${_param:openstack_control_address}
discovery:
host: None
database: