commit c95e03507d2c0d93de7f631664e2c3f33821d47e
author Jakub Josef <jakub.josef@gmail.com> Fri Jul 28 14:24:20 2017 +0000
committer Gerrit Code Review <gerrit2@4c27dc91eb4f> Fri Jul 28 14:24:24 2017 +0000
tree 98adbc0bd8e5e2350ff5401c8ebfeae0ebdc51dc
parent 35f5de442efd21b0037a128c2f56fd20662ca813
parent 81dab2ef089f7da03b4392ceafcfbe26b3f8296d

Merge "Added silent start mode for gating jobs"

docker/swarm/stack/influxdb.yml

diff --git a/docker/swarm/stack/influxdb.yml b/docker/swarm/stack/influxdb.yml
index e753d18..f9b1f58 100644
--- a/docker/swarm/stack/influxdb.yml
+++ b/docker/swarm/stack/influxdb.yml
@@ -5,7 +5,7 @@
 parameters:
   _param:
     docker_influxdb_replicas: 1
-    docker_influxdb_data_dir: /srv/volumes/influxdb
+    docker_influxdb_dir: /srv/volumes/influxdb
   docker:
     client:
       stack:
@@ -19,11 +19,12 @@
               environment:
                 INFLUXDB_CONFIG_PATH: /etc/influxdb/influxdb.conf
                 INFLUXDB_DATA_DIR: /var/lib/influxdb/data
-                INFLUXDB_DATA_WAL_DIR: /var/lib/influxdb/wal
+                INFLUXDB_META_DIR: /var/lib/influxdb/meta
+                INFLUXDB_DATA_WAL_DIR: /tmp/wal
               image: ${_param:docker_influxdb_image}
               ports:
               - 15016:8086
               volumes:
               - ${influxdb:server:prefix_dir}/etc/influxdb:/etc/influxdb
-              - ${_param:docker_influxdb_data_dir}:/var/lib/influxdb/data
-              - ${influxdb:server:data:wal_dir}:/var/lib/influxdb/wal
+              - ${_param:docker_influxdb_dir}:/var/lib/influxdb
+              - ${influxdb:server:data:wal_dir}:/tmp/wal

docker/swarm/stack/jenkins/master.yml

diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index d851962..bc01e92 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    docker_image_jenkins: tcpcloud/jenkins:2.63
+    docker_image_jenkins: tcpcloud/jenkins:2.71
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
   docker:
@@ -10,7 +10,7 @@
           service:
             master:
               environment:
-                JAVA_OPTS: " -server -XX:+AlwaysPreTouch -Xloggc:$JENKINS_HOME/gc-%t.log -XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com ${_param:jenkins_master_extra_opts}"
+                JAVA_OPTS: " -server -XX:+AlwaysPreTouch -Xloggc:$JENKINS_HOME/gc-%t.log -XX:NumberOfGCLogFiles=5 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=20m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com ${_param:jenkins_master_extra_opts}"
                 JENKINS_NUM_EXECUTORS: ${_param:jenkins_master_executors_num}
               deploy:
                 restart_policy:

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

diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 3db11b8..b25fd03 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -77,7 +77,7 @@
               SALT_MASTER_URL:
                 type: string
                 default: ""
-             SALT_OVERRIDES:
+              SALT_OVERRIDES:
                 type: text
                 default: ""
                 description: "YAML with overrides for Salt deployment"

keystone/client/service/octavia.yml

diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index 4e14217..0382345 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -36,3 +36,4 @@
             host: ${_param:keystone_service_host}
             port: 5000
             region_name: ${_param:openstack_region}
+            use_keystoneauth: true

sensu/server/cluster.yml

diff --git a/sensu/server/cluster.yml b/sensu/server/cluster.yml
index 28eb78b..5c8fe85 100644
--- a/sensu/server/cluster.yml
+++ b/sensu/server/cluster.yml
@@ -11,6 +11,15 @@
     rabbitmq_cold_password: password
     rabbitmq_monitor_password: password
     sensu_message_queue_host: ${_param:cluster_vip_address}
+    cluster_redis_port: 6379
+  sensu:
+   server:
+     bind:
+       address: ${_param:single_address}
+     database:
+       engine: redis
+       host: ${_param:cluster_vip_address}
+       port: ${_param:cluster_redis_port}
   rabbitmq:
     cluster:
       name: 'monitoring'