commit ebdbde22368d6e8cc508c65746cd053ae057df4b
author Jakub Josef <jjosef@mirantis.com> Fri Jul 28 12:12:11 2017 +0000
committer Gerrit Code Review <gerrit2@4c27dc91eb4f> Fri Jul 28 12:49:46 2017 +0000
tree ca7ba35174fef6dacbe7ae96e11b067f6efb0c8d
parent e84d8fd2f29f7bf4d6868594eb06fee93a45e761
parent ffa0b6a22be87104943b191110eef33587ad261a

Merge "Enable keystoneauth for octavia_identity"

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: