Merge remote-tracking branch 'target/master'
diff --git a/aptly/server/mirror/ubuntu/trusty/influxdb.yml b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
new file mode 100644
index 0000000..8d30a05
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ mirror:
+ influxdb-trusty:
+ source: https://repos.influxdata.com/ubuntu/
+ distribution: trusty
+ components: stable
+ architectures: amd64
+ gpgkeys:
+ - 2582E0C5
+ publisher:
+ component: influxdb
+ distributions:
+ - trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
new file mode 100644
index 0000000..1bc4341
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
@@ -0,0 +1,26 @@
+parameters:
+ aptly:
+ server:
+ mirror:
+ ceph-mirantis-xenial:
+ source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
+ distribution: jewel-xenial
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 460F3994
+ publisher:
+ component: ceph-mirantis
+ distributions:
+ - xenial/nightly
+ decapod-ceph-mirantis-xenial:
+ source: http://eu.mirror.fuel-infra.org/decapod/ceph/apt
+ distribution: jewel-xenial
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 460F3994
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial-decapod-ceph/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/hp.yml b/aptly/server/mirror/ubuntu/xenial/hp.yml
new file mode 100644
index 0000000..5b84417
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/hp.yml
@@ -0,0 +1,18 @@
+parameters:
+ aptly:
+ server:
+ mirror:
+ hp-xenial:
+ source: http://downloads.linux.hpe.com/SDR/repo/mcp/Ubuntu
+ distribution: xenial/current
+ components: non-free
+ architectures: amd64
+ gpgkeys:
+ - 26C2B797
+ - B1275EA3
+ - 5CE2D476
+ - 2689B887
+ publisher:
+ component: hp-non-free
+ distributions:
+ - xenial/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/maas.yml b/aptly/server/mirror/ubuntu/xenial/maas.yml
new file mode 100644
index 0000000..1382a09
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/maas.yml
@@ -0,0 +1,15 @@
+parameters:
+ aptly:
+ server:
+ mirror:
+ maas-xenial:
+ source: http://ppa.launchpad.net/maas/stable/ubuntu
+ distribution: xenial
+ components: main
+ architectures: amd64
+ gpgkeys:
+ - 684D4A1C
+ publisher:
+ component: maas
+ distributions:
+ - xenial/nightly
diff --git a/haproxy/proxy/listen/openstack/galera.yml b/haproxy/proxy/listen/openstack/galera.yml
index 56182d6..254dc3b 100644
--- a/haproxy/proxy/listen/openstack/galera.yml
+++ b/haproxy/proxy/listen/openstack/galera.yml
@@ -1,6 +1,12 @@
parameters:
haproxy:
proxy:
+ timeout:
+ queue: '10s'
+ connect: '10s'
+ client: '10s'
+ server: '10s'
+ check: '10s'
listen:
mysql_cluster:
type: mysql
@@ -12,12 +18,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 3306
- params: check
+ params: check inter 20s fastinter 2s downinter 2s rise 3 fall 3
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 3306
- params: backup check
+ params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 3306
- params: backup check
\ No newline at end of file
+ params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3