commit a0f84dfc2e391732ef5ebc607dc7c27f647fd0cf
author Jakub Pavlik <pavlk.jakub@gmail.com> Wed Jul 12 09:31:05 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Wed Jul 12 09:31:08 2017 +0000
tree 3e2de7888454fa7d7312479d3a8fadbabb0eb1e7
parent cf21d423b32a3fe570895acb11bedef55b7536dc
parent c292a9b5afb28898fc250f5006b8cbf017bac958

Merge "Fix baremetal endpoint position"

docker/swarm/stack/security_monkey.yml

diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index 167a058..a83f2a0 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -14,6 +14,7 @@
     security_monkey_api_port: ${_param:haproxy_security_monkey_bind_port}
     security_monkey_nginx_port: ${_param:haproxy_security_monkey_bind_port}
     devops_portal_sm_wtf_csrf_enabled: False
+    security_monkey_sync_interval: 15
     security_monkey_openstack:
       os_account_id: mcp_cloud
       os_account_name: mcp_cloud
@@ -49,6 +50,7 @@
             OS_PROJECT_NAME: ${_param:security_monkey_openstack:project_name}
             USER_DOMAIN_NAME: ${_param:security_monkey_openstack:user_domain_name}
             SM_WTF_CSRF_ENABLED: ${_param:devops_portal_sm_wtf_csrf_enabled}
+            SECURITY_MONKEY_SYNC_INTERVAL: ${_param:security_monkey_sync_interval}
           service:
             api:
               image: ${_param:docker_image_security_monkey_api}
@@ -67,4 +69,4 @@
                 restart_policy:
                   condition: any
               volumes:
-                - /srv/volumes/security_monkey/logs:/var/log/security_monkey/logs
\ No newline at end of file
+                - /srv/volumes/security_monkey/logs:/var/log/security_monkey/logs

jenkins/client/job/deploy/lab/mk/cloud.yml

diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index fa13051..4e4080b 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -2,10 +2,6 @@
   _param:
     jenkins_cloud_deploy_pipelines:
       - stack_name: k8s_calico
-        stack_type: heat
-        stack_install: core,k8s,calico
-        job_timer: ""
-      - stack_name: k8s_calico
         stack_type: aws
         stack_install: core,k8s,calico
         job_timer: "H H * * *"
@@ -55,15 +51,15 @@
         job_timer: ""
       - stack_name: stacklight_k8s_calico
         stack_type: heat
-        stack_install: core,k8s,calico,stacklight
+        stack_install: core,k8s,calico,sl-legacy
         job_timer: ""
       - stack_name: stacklight_os_contrail
         stack_type: heat
-        stack_install: core,openstack,contrail,stacklight
+        stack_install: core,openstack,contrail,sl-legacy
         job_timer: ""
       - stack_name: stacklight_os_ovs
         stack_type: heat
-        stack_install: core,openstack,ovs,stacklight
+        stack_install: core,openstack,ovs,sl-legacy
         job_timer: ""
   jenkins:
     client: