Merge "Fix InfluxDB stack"
diff --git a/cinder/control/backend/ceph.yml b/cinder/control/backend/ceph.yml
index 1026f68..3b036d4 100644
--- a/cinder/control/backend/ceph.yml
+++ b/cinder/control/backend/ceph.yml
@@ -11,3 +11,4 @@
user: ${_param:cinder_storage_user}
secret_uuid: ${_param:cinder_storage_secret_uuid}
client_cinder_key: ${_param:cinder_storage_client_key}
+ host: ceph
diff --git a/cinder/volume/backend/ceph.yml b/cinder/volume/backend/ceph.yml
index 6560add..945f2f9 100644
--- a/cinder/volume/backend/ceph.yml
+++ b/cinder/volume/backend/ceph.yml
@@ -1,7 +1,7 @@
parameters:
cinder:
volume:
- message_queue:
+ message_queue:
ha_queues: true
enabled: true
notification: true
@@ -15,3 +15,4 @@
user: ${_param:cinder_storage_user}
secret_uuid: ${_param:cinder_storage_secret_uuid}
client_cinder_key: ${_param:cinder_storage_client_key}
+ host: ceph
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 54b0093..f6d12e5 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,8 @@
parameters:
_param:
docker_image_jenkins: tcpcloud/jenkins:2.63
+ jenkins_master_extra_opts: ""
+ jenkins_master_executors_num: 4
docker:
client:
stack:
@@ -8,8 +10,8 @@
service:
master:
environment:
- JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
- JENKINS_NUM_EXECUTORS: 4
+ 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:
condition: any
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 996400e..b25fd03 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -77,6 +77,10 @@
SALT_MASTER_URL:
type: string
default: ""
+ SALT_OVERRIDES:
+ type: text
+ default: ""
+ description: "YAML with overrides for Salt deployment"
# openstack api
OPENSTACK_API_URL:
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 1da507c..99e230b 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -23,12 +23,8 @@
tags: "2.32"
dockerfile: "Dockerfile"
- name: jenkins
- branch: "2.52"
- tags: "2.52 latest"
- dockerfile: "Dockerfile"
- - name: jenkins
- branch: "2.70"
- tags: "2.70 latest"
+ branch: "2.71"
+ tags: "2.71 latest"
dockerfile: "Dockerfile"
- name: phpldapadmin
branch: "master"
diff --git a/linux/system/repo/docker.yml b/linux/system/repo/docker.yml
index 6eae575..c527aa8 100644
--- a/linux/system/repo/docker.yml
+++ b/linux/system/repo/docker.yml
@@ -6,4 +6,4 @@
source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main"
architectures: amd64
key_id: 58118E89F3A912897C070ADBF76221572C52609D
- key_server: hkp://p80.pool.sks-keyservers.net:80
+ key_server: keyserver.ubuntu.com