Merge "Add jobs for k8s external DNS"
diff --git a/barbican/server/cluster.yml b/barbican/server/cluster.yml
index dd4804f..7e4c0e4 100644
--- a/barbican/server/cluster.yml
+++ b/barbican/server/cluster.yml
@@ -2,11 +2,14 @@
- service.barbican.server.cluster
- system.haproxy.proxy.listen.openstack.barbican
- system.salt.minion.cert.mysql.clients.openstack.barbican
+- system.salt.minion.cert.rabbitmq.clients.openstack.barbican
parameters:
_param:
cluster_internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
barbican:
server:
@@ -24,6 +27,13 @@
enabled: ${_param:galera_ssl_enabled}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
system:
package:
diff --git a/barbican/server/single.yml b/barbican/server/single.yml
index 21054e3..befad42 100644
--- a/barbican/server/single.yml
+++ b/barbican/server/single.yml
@@ -1,11 +1,14 @@
classes:
- service.barbican.server.single
- system.salt.minion.cert.mysql.clients.openstack.barbican
+- system.salt.minion.cert.rabbitmq.clients.openstack.barbican
parameters:
_param:
internal_protocol: 'http'
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
barbican:
server:
@@ -22,6 +25,13 @@
protocol: ${_param:internal_protocol}
message_queue:
port: ${_param:openstack_rabbitmq_port}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
system:
package:
diff --git a/designate/server/cluster/default.yml b/designate/server/cluster/default.yml
index 8b9e1d0..1e8076e 100644
--- a/designate/server/cluster/default.yml
+++ b/designate/server/cluster/default.yml
@@ -4,7 +4,7 @@
- system.haproxy.proxy.listen.openstack.designate
- service.designate.server.cluster
- system.salt.minion.cert.mysql.clients.openstack.designate
-- system.salt.minion.cert.rabbitmq.clients.openstack.designatev
+- system.salt.minion.cert.rabbitmq.clients.openstack.designate
parameters:
_param:
designate_admin_api_enabled: false
diff --git a/haproxy/proxy/listen/openstack/aodh.yml b/haproxy/proxy/listen/openstack/aodh.yml
index acd6340..bf30f93 100644
--- a/haproxy/proxy/listen/openstack/aodh.yml
+++ b/haproxy/proxy/listen/openstack/aodh.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_aodh-api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8042
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_aodh-api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8042
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_aodh-api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8042
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_aodh-api_check_params}
diff --git a/haproxy/proxy/listen/openstack/barbican.yml b/haproxy/proxy/listen/openstack/barbican.yml
index c1f9877..d4a35d9 100644
--- a/haproxy/proxy/listen/openstack/barbican.yml
+++ b/haproxy/proxy/listen/openstack/barbican.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_barbican-api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_barbican-admin-api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,15 +15,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9311
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_barbican-api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9311
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_barbican-api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9311
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_barbican-api_check_params}
barbican-admin-api:
type: openstack-service
service_name: barbican
@@ -31,12 +34,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9312
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_barbican-admin-api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9312
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_barbican-admin-api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9312
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_barbican-admin-api_check_params}
diff --git a/haproxy/proxy/listen/openstack/ceilometer.yml b/haproxy/proxy/listen/openstack/ceilometer.yml
index 68eef43..563aa21 100644
--- a/haproxy/proxy/listen/openstack/ceilometer.yml
+++ b/haproxy/proxy/listen/openstack/ceilometer.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_ceilometer_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8777
- params: check
\ No newline at end of file
+ params: ${_param:haproxy_ceilometer_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/ceilometer_large.yml b/haproxy/proxy/listen/openstack/ceilometer_large.yml
index 8b9fa7e..4ca55d9 100644
--- a/haproxy/proxy/listen/openstack/ceilometer_large.yml
+++ b/haproxy/proxy/listen/openstack/ceilometer_large.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_ceilometer_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,20 +14,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8777
- params: check
+ params: ${_param:haproxy_ceilometer_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/cinder.yml b/haproxy/proxy/listen/openstack/cinder.yml
index c0bb7be..85f2c46 100644
--- a/haproxy/proxy/listen/openstack/cinder.yml
+++ b/haproxy/proxy/listen/openstack/cinder.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_cinder_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_cinder_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/cinder_large.yml b/haproxy/proxy/listen/openstack/cinder_large.yml
index 7721f94..e13f54b 100644
--- a/haproxy/proxy/listen/openstack/cinder_large.yml
+++ b/haproxy/proxy/listen/openstack/cinder_large.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_cinder_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,20 +14,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_cinder_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8776
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_cinder_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/glance.yml b/haproxy/proxy/listen/openstack/glance.yml
index 144fd4e..aa1d923 100644
--- a/haproxy/proxy/listen/openstack/glance.yml
+++ b/haproxy/proxy/listen/openstack/glance.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_glance_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_glance_registry_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,15 +15,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
glance_registry_api:
type: general-service
service_name: glance
@@ -31,12 +34,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/glance_large.yml b/haproxy/proxy/listen/openstack/glance_large.yml
index 6d88933..c6be106 100644
--- a/haproxy/proxy/listen/openstack/glance_large.yml
+++ b/haproxy/proxy/listen/openstack/glance_large.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_glance_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_glance_registry_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,23 +15,23 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 9292
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glance_api_check_params}
glance_registry_api:
type: general-service
service_name: glance
@@ -39,20 +42,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 9191
- params: check
+ params: ${_param:haproxy_glance_registry_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 9191
- params: check
\ No newline at end of file
+ params: ${_param:haproxy_glance_registry_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/glare.yml b/haproxy/proxy/listen/openstack/glare.yml
index 36a6337..afdf436 100644
--- a/haproxy/proxy/listen/openstack/glare.yml
+++ b/haproxy/proxy/listen/openstack/glare.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_glare_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
diff --git a/haproxy/proxy/listen/openstack/glare_large.yml b/haproxy/proxy/listen/openstack/glare_large.yml
index 4e3bd08..0e8c8d7 100644
--- a/haproxy/proxy/listen/openstack/glare_large.yml
+++ b/haproxy/proxy/listen/openstack/glare_large.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_glare_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,20 +14,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_glare_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 9494
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_glare_check_params}
diff --git a/haproxy/proxy/listen/openstack/gnocchi.yml b/haproxy/proxy/listen/openstack/gnocchi.yml
index ec2bb20..8971d6d 100644
--- a/haproxy/proxy/listen/openstack/gnocchi.yml
+++ b/haproxy/proxy/listen/openstack/gnocchi.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_gnocchi_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8041
- params: check
+ params: ${_param:haproxy_gnocchi_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8041
- params: check
+ params: ${_param:haproxy_gnocchi_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8041
- params: check
\ No newline at end of file
+ params: ${_param:haproxy_gnocchi_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
index 50595ea..cb24614 100644
--- a/haproxy/proxy/listen/openstack/heat.yml
+++ b/haproxy/proxy/listen/openstack/heat.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ haproxy_heat_cloudwatch_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_heat_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_heat_cfn_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,15 +16,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
heat_api:
type: openstack-service
service_name: heat
@@ -31,15 +35,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
heat_cfn_api:
type: openstack-service
service_name: heat
@@ -50,12 +54,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/heat_large.yml b/haproxy/proxy/listen/openstack/heat_large.yml
index 50ba69f..2272c3e 100644
--- a/haproxy/proxy/listen/openstack/heat_large.yml
+++ b/haproxy/proxy/listen/openstack/heat_large.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ haproxy_heat_cloudwatch_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_heat_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_heat_cfn_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,23 +16,23 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8003
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cloudwatch_api_check_params}
heat_api:
type: openstack-service
service_name: heat
@@ -39,23 +43,23 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8004
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_api_check_params}
heat_cfn_api:
type: openstack-service
service_name: heat
@@ -66,20 +70,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_heat_cfn_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ params: ${_param:haproxy_heat_cfn_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/horizon.yml b/haproxy/proxy/listen/openstack/horizon.yml
index d507b96..dfa826b 100644
--- a/haproxy/proxy/listen/openstack/horizon.yml
+++ b/haproxy/proxy/listen/openstack/horizon.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_horizon_web_check_params: check
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8078
- params: check
+ params: ${_param:haproxy_horizon_web_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8078
- params: check
+ params: ${_param:haproxy_horizon_web_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8078
- params: check
+ params: ${_param:haproxy_horizon_web_check_params}
diff --git a/haproxy/proxy/listen/openstack/ironic.yml b/haproxy/proxy/listen/openstack/ironic.yml
index 1713085..9565ba6 100644
--- a/haproxy/proxy/listen/openstack/ironic.yml
+++ b/haproxy/proxy/listen/openstack/ironic.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_ironic_check_params: check
haproxy:
proxy:
listen:
@@ -13,13 +15,13 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_check_params}
diff --git a/haproxy/proxy/listen/openstack/ironic_deploy.yml b/haproxy/proxy/listen/openstack/ironic_deploy.yml
index f5e7a4f..fadc4c5 100644
--- a/haproxy/proxy/listen/openstack/ironic_deploy.yml
+++ b/haproxy/proxy/listen/openstack/ironic_deploy.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_ironic_deploy_check_params: check
haproxy:
proxy:
listen:
@@ -13,12 +15,12 @@
- name: bmt01
host: ${_param:openstack_baremetal_node01_baremetal_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_deploy_check_params}
- name: bmt02
host: ${_param:openstack_baremetal_node02_baremetal_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_deploy_check_params}
- name: bmt03
host: ${_param:openstack_baremetal_node03_baremetal_address}
port: 6385
- params: check
+ params: ${_param:haproxy_ironic_deploy_check_params}
diff --git a/haproxy/proxy/listen/openstack/keystone/init.yml b/haproxy/proxy/listen/openstack/keystone/init.yml
index 32f776e..8fe4dad 100644
--- a/haproxy/proxy/listen/openstack/keystone/init.yml
+++ b/haproxy/proxy/listen/openstack/keystone/init.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_keystone_public_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_keystone_admin_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -10,15 +13,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
keystone_admin_api:
binds:
- address: ${_param:cluster_vip_address}
@@ -27,12 +30,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/keystone/large.yml b/haproxy/proxy/listen/openstack/keystone/large.yml
index 17510ac..e40803b 100644
--- a/haproxy/proxy/listen/openstack/keystone/large.yml
+++ b/haproxy/proxy/listen/openstack/keystone/large.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_keystone_public_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_keystone_admin_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -10,23 +13,23 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 5000
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_public_api_check_params}
keystone_admin_api:
binds:
- address: ${_param:cluster_vip_address}
@@ -35,20 +38,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 35357
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_keystone_admin_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/manila.yml b/haproxy/proxy/listen/openstack/manila.yml
index a28f365..fcc09de 100644
--- a/haproxy/proxy/listen/openstack/manila.yml
+++ b/haproxy/proxy/listen/openstack/manila.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_manila_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8786
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_manila_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8786
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_manila_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8786
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_manila_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/murano.yml b/haproxy/proxy/listen/openstack/murano.yml
index 0427820..1c9714e 100644
--- a/haproxy/proxy/listen/openstack/murano.yml
+++ b/haproxy/proxy/listen/openstack/murano.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_murano_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,7 +14,8 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8082
- params: check
+ params: ${_param:haproxy_murano_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
- port: 8082
\ No newline at end of file
+ port: 8082
+ params: ${_param:haproxy_murano_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/nova-placement.yml b/haproxy/proxy/listen/openstack/nova-placement.yml
index 58c9dd2..41bedc8 100644
--- a/haproxy/proxy/listen/openstack/nova-placement.yml
+++ b/haproxy/proxy/listen/openstack/nova-placement.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_nova_placement_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -21,12 +23,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/nova-placement_large.yml b/haproxy/proxy/listen/openstack/nova-placement_large.yml
index 0139959..9d8dfb8 100644
--- a/haproxy/proxy/listen/openstack/nova-placement_large.yml
+++ b/haproxy/proxy/listen/openstack/nova-placement_large.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_nova_placement_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -21,20 +23,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_placement_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/nova.yml b/haproxy/proxy/listen/openstack/nova.yml
index 1e090ef..2abea3d 100644
--- a/haproxy/proxy/listen/openstack/nova.yml
+++ b/haproxy/proxy/listen/openstack/nova.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_nova_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_nova_metadata_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,15 +15,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
nova_metadata_api:
type: openstack-service
binds:
@@ -30,12 +33,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/nova_large.yml b/haproxy/proxy/listen/openstack/nova_large.yml
index 645e904..b09a3b6 100644
--- a/haproxy/proxy/listen/openstack/nova_large.yml
+++ b/haproxy/proxy/listen/openstack/nova_large.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_nova_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_nova_metadata_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,23 +15,23 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8774
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_api_check_params}
nova_metadata_api:
type: openstack-service
binds:
@@ -38,20 +41,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8775
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_nova_metadata_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/novnc.yml b/haproxy/proxy/listen/openstack/novnc.yml
index 40b9d9c..37934c0 100644
--- a/haproxy/proxy/listen/openstack/novnc.yml
+++ b/haproxy/proxy/listen/openstack/novnc.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_nova_novnc_check_params: check
haproxy:
proxy:
listen:
@@ -13,13 +15,13 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
diff --git a/haproxy/proxy/listen/openstack/novnc_large.yml b/haproxy/proxy/listen/openstack/novnc_large.yml
index 0951777..2c2cbd6 100644
--- a/haproxy/proxy/listen/openstack/novnc_large.yml
+++ b/haproxy/proxy/listen/openstack/novnc_large.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_nova_novnc_check_params: check
haproxy:
proxy:
listen:
@@ -13,20 +15,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 6080
- params: check
+ params: ${_param:haproxy_nova_novnc_check_params}
diff --git a/haproxy/proxy/listen/openstack/octavia.yml b/haproxy/proxy/listen/openstack/octavia.yml
index c2b8e6d..89f0569 100644
--- a/haproxy/proxy/listen/openstack/octavia.yml
+++ b/haproxy/proxy/listen/openstack/octavia.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_octavia_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 9876
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_octavia_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 9876
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_octavia_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 9876
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_octavia_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/panko.yml b/haproxy/proxy/listen/openstack/panko.yml
index 51eb030..bf638ef 100644
--- a/haproxy/proxy/listen/openstack/panko.yml
+++ b/haproxy/proxy/listen/openstack/panko.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_panko_api_check_params: check
haproxy:
proxy:
listen:
@@ -12,12 +14,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8977
- params: check
+ params: ${_param:haproxy_panko_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8977
- params: check
+ params: ${_param:haproxy_panko_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8977
- params: check
\ No newline at end of file
+ params: ${_param:haproxy_panko_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/placement.yml b/haproxy/proxy/listen/openstack/placement.yml
index f3b2b99..b2e37bb 100644
--- a/haproxy/proxy/listen/openstack/placement.yml
+++ b/haproxy/proxy/listen/openstack/placement.yml
@@ -2,6 +2,8 @@
# returns 200 with version data instead of 401 as it was before.
# This file should be included for nova/placement higher than Queens.
parameters:
+ _param:
+ haproxy_placement_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -15,12 +17,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/placement_large.yml b/haproxy/proxy/listen/openstack/placement_large.yml
index c871fd7..d559572 100644
--- a/haproxy/proxy/listen/openstack/placement_large.yml
+++ b/haproxy/proxy/listen/openstack/placement_large.yml
@@ -2,6 +2,8 @@
# returns 200 with version data instead of 401 as it was before.
# This file should be included for nova/placement higher than Queens.
parameters:
+ _param:
+ haproxy_placement_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -15,20 +17,20 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
port: 8778
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_placement_api_check_params}
diff --git a/haproxy/proxy/listen/openstack/sahara.yml b/haproxy/proxy/listen/openstack/sahara.yml
index 335c4f6..7ece261 100644
--- a/haproxy/proxy/listen/openstack/sahara.yml
+++ b/haproxy/proxy/listen/openstack/sahara.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_sahara_api_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
haproxy:
proxy:
listen:
@@ -13,12 +15,12 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 8386
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_sahara_api_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 8386
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_sahara_api_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8386
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ params: ${_param:haproxy_sahara_api_check_params}
diff --git a/keystone/client/os_client_config/octavia_identity.yml b/keystone/client/os_client_config/octavia_identity.yml
new file mode 100644
index 0000000..3d84b0c
--- /dev/null
+++ b/keystone/client/os_client_config/octavia_identity.yml
@@ -0,0 +1,20 @@
+parameters:
+ keystone:
+ client:
+ os_client_config:
+ enabled: true
+ cfgs:
+ root:
+ content:
+ clouds:
+ octavia_identity:
+ region_name: ${_param:openstack_region}
+ identity_api_version: '3'
+ interface: 'internal'
+ auth:
+ username: 'octavia'
+ password: ${_param:keystone_octavia_password}
+ user_domain_name: 'Default'
+ project_name: 'service'
+ project_domain_name: 'Default'
+ auth_url: ${_param:keystone_service_protocol}://${_param:keystone_service_host}:5000
\ No newline at end of file
diff --git a/keystone/client/v3/service/octavia.yml b/keystone/client/v3/service/octavia.yml
index d571105..56de95b 100644
--- a/keystone/client/v3/service/octavia.yml
+++ b/keystone/client/v3/service/octavia.yml
@@ -1,3 +1,6 @@
+classes:
+- system.keystone.client.os_client_config.octavia_identity
+
parameters:
_param:
cluster_public_protocol: https
@@ -5,8 +8,18 @@
octavia_service_protocol: http
keystone:
client:
+ server:
+ identity:
+ octavia:
+ api_version: 3
+ octavia_identity:
+ admin:
+ api_version: ''
+ user_domain_name: 'Default'
+ project_domain_name: 'Default'
resources:
v3:
+ cloud_name: 'octavia_identity'
roles:
global_load_balancer_member:
name: load-balancer_member
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 46f600b..9ea811e 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -3,11 +3,14 @@
- service.haproxy.proxy.single
- system.haproxy.proxy.listen.openstack.manila
- system.salt.minion.cert.mysql.clients.openstack.manila
+- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
manila_cluster_vip_address: ${_param:cluster_vip_address}
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
manila:
common:
@@ -19,6 +22,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
host: ${_param:openstack_message_queue_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index e806cde..f984ab7 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -1,10 +1,13 @@
classes:
- service.manila.common.single
- system.salt.minion.cert.mysql.clients.openstack.manila
+- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
_param:
openstack_mysql_x509_enabled: False
galera_ssl_enabled: False
+ openstack_rabbitmq_x509_enabled: False
+ rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
manila:
common:
@@ -16,6 +19,13 @@
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
host: ${_param:single_address}
+ x509:
+ enabled: ${_param:openstack_rabbitmq_x509_enabled}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
database:
engine: mysql
host: ${_param:single_address}
diff --git a/openssh/server/team/drivetrain.yml b/openssh/server/team/drivetrain.yml
index a48400a..65117cd 100644
--- a/openssh/server/team/drivetrain.yml
+++ b/openssh/server/team/drivetrain.yml
@@ -1,7 +1,7 @@
classes:
+- system.openssh.server.team.members.azvyagintsev
- system.openssh.server.team.members.degorenko
- system.openssh.server.team.members.iberezovskiy
-
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/members/azvyagintsev.yml b/openssh/server/team/members/azvyagintsev.yml
new file mode 100644
index 0000000..c6c62a0
--- /dev/null
+++ b/openssh/server/team/members/azvyagintsev.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ azvyagintsev:
+ enabled: true
+ name: azvyagintsev
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Aleksey Zvyagintsev
+ home: /home/azvyagintsev
+ email: azvyagintsev@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ azvyagintsev:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGmNI+xV2sgIZX6tr5i4eQcxM4rkNoMiFbUuxtZYw5rKci9cSp9C/NC11VnJzpLG3lf11vLwTztlaM7hjdYlKoynpfDhfRhg1p5w/Pd/uoh6bO7KP/r2QuSpVsc6NGAHD2f0qxmrFX81xMG6zq0MCHXc+BGMZTKWAW7dMGsjJUnIa/wv24J25DOILoEBhclGQHx5r7R5ysqSOTdBEgN304KL8XPP+bAwDFTNJIwtfBdNt8jSv6yR2CyfB7t8pqXf93DvwaGBJfuu1r4gljj5ozCyvGExEtRTzvAC+oLq2NIfDOCC3iRWXrls3iDLZYxwm7VLcQSre4Yp6jfp+WuRI7 azvyagintsev@mirantis.com
+ user: ${linux:system:user:azvyagintsev}
diff --git a/openssh/server/team/members/mrasskazov.yml b/openssh/server/team/members/mrasskazov.yml
new file mode 100644
index 0000000..23926e8
--- /dev/null
+++ b/openssh/server/team/members/mrasskazov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ mrasskazov:
+ enabled: true
+ name: mrasskazov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Maxim Rasskazov
+ home: /home/mrasskazov
+ email: mrasskazov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ mrasskazov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCysPXCuMbUjqjtO/n0jVZK13/uMA/TI6Qsdyciih6jWJLbd6FCL/GWvkykngLHGH9lVGFYsOPRiAmlh8gXfYohCZFYuHxE88GoiycvJGRGoBDdxd/beDca6nP4Peqlg3TUUum9PefULDiv3eVHKwX4BC9mGIR6bWB41O003OxJMwEN9lLGmWqxAlAdCUwRIm9TlgTu6Fq3ZIkjSwGsZg4E+saBLnUiOjwYWSwmTiB8WTR2b19lZhXFEovdVY3/gF8Td84WT1TDXeWBAvwmAcFLRPEx/AI1Nt4AhM1toMMoq64pYbGCOYSgI7DZR/2vtxGa0IjQclLZ+M8YktyNErc9
+ user: ${linux:system:user:mrasskazov}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 219c2ee..b314c59 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -9,6 +9,7 @@
- system.openssh.server.team.members.gzimin
- system.openssh.server.team.members.dpyzhov
- system.openssh.server.team.members.asamoylov
+- system.openssh.server.team.members.mrasskazov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/reclass/storage/salt.yml b/reclass/storage/salt.yml
index 0a21cdb..b2025c4 100644
--- a/reclass/storage/salt.yml
+++ b/reclass/storage/salt.yml
@@ -8,6 +8,8 @@
engine: git
address: '${_param:reclass_data_repository}'
branch: ${_param:reclass_data_revision}
+
+ # TODO, remove this once not required for backward compatibility
salt:
master:
pillar:
diff --git a/salt/master/pillar/composite/reclass.yml b/salt/master/pillar/composite/reclass.yml
index 0b5443b..601f3bf 100644
--- a/salt/master/pillar/composite/reclass.yml
+++ b/salt/master/pillar/composite/reclass.yml
@@ -1,2 +1,15 @@
classes:
- service.salt.master.pillar.composite.reclass
+
+parameters:
+ salt:
+ master:
+ pillar:
+ reclass:
+ allow_none_override: True
+
+ # NOTE, it's not good practice to combine formula pillars here
+ # exception: in this case is required to sync the same options
+ reclass:
+ storage:
+ allow_none_override: True
diff --git a/salt/master/pillar/reclass.yml b/salt/master/pillar/reclass.yml
index cfeca33..8b88bf4 100644
--- a/salt/master/pillar/reclass.yml
+++ b/salt/master/pillar/reclass.yml
@@ -1,2 +1,9 @@
classes:
- service.salt.master.pillar.reclass
+
+parameters:
+ salt:
+ master:
+ pillar:
+ engine: reclass
+ data_dir: /srv/salt/reclass
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
new file mode 100644
index 0000000..9fa04ef
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/barbican.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_barbican_client_ssl_key_file: /etc/barbican/ssl/rabbitmq/client-key.pem
+ rabbitmq_barbican_client_ssl_cert_file: /etc/barbican/ssl/rabbitmq/client-cert.pem
+ rabbitmq_barbican_ssl_ca_file: /etc/barbican/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-barbican-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-barbican-client
+ signing_policy: cert_client
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_barbican_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_barbican_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_barbican_ssl_ca_file}
+ user: barbican
+ group: barbican
+ mode: 640
diff --git a/salt/minion/cert/rabbitmq/clients/openstack/manila.yml b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
new file mode 100644
index 0000000..345b697
--- /dev/null
+++ b/salt/minion/cert/rabbitmq/clients/openstack/manila.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ rabbitmq_manila_client_ssl_key_file: /etc/manila/ssl/rabbitmq/client-key.pem
+ rabbitmq_manila_client_ssl_cert_file: /etc/manila/ssl/rabbitmq/client-cert.pem
+ rabbitmq_manila_ssl_ca_file: /etc/manila/ssl/rabbitmq/ca-cert.pem
+ salt:
+ minion:
+ cert:
+ rabbitmq-manila-client:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: rabbitmq-manila-client
+ signing_policy: cert_client
+ key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
+ key_file: ${_param:rabbitmq_manila_client_ssl_key_file}
+ cert_file: ${_param:rabbitmq_manila_client_ssl_cert_file}
+ ca_file: ${_param:rabbitmq_manila_ssl_ca_file}
+ user: manila
+ group: manila
+ mode: 640