Merge "Add default ssl parameters"
diff --git a/haproxy/proxy/listen/openstack/designate.yml b/haproxy/proxy/listen/openstack/designate.yml
index 7a54af2..1310be4 100644
--- a/haproxy/proxy/listen/openstack/designate.yml
+++ b/haproxy/proxy/listen/openstack/designate.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_designate_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_designate_port: 9001
haproxy:
proxy:
listen:
@@ -7,13 +10,13 @@
service_name: designate
binds:
- address: ${_param:cluster_vip_address}
- port: 9001
+ port: ${_param:haproxy_designate_port}
servers:
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
- port: 9001
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
- port: 9001
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_designate_port}
+ params: ${_param:haproxy_designate_check_params}
diff --git a/haproxy/proxy/listen/openstack/neutron.yml b/haproxy/proxy/listen/openstack/neutron.yml
index 29bd548..ebc3f1a 100644
--- a/haproxy/proxy/listen/openstack/neutron.yml
+++ b/haproxy/proxy/listen/openstack/neutron.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_neutron_port: 9696
haproxy:
proxy:
listen:
@@ -7,17 +10,17 @@
service_name: neutron
binds:
- address: ${_param:cluster_vip_address}
- port: 9696
+ port: ${_param:haproxy_neutron_port}
servers:
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
diff --git a/haproxy/proxy/listen/openstack/neutron_large.yml b/haproxy/proxy/listen/openstack/neutron_large.yml
index 8df1243..5039586 100644
--- a/haproxy/proxy/listen/openstack/neutron_large.yml
+++ b/haproxy/proxy/listen/openstack/neutron_large.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ haproxy_neutron_port: 9696
haproxy:
proxy:
listen:
@@ -7,25 +10,25 @@
service_name: neutron
binds:
- address: ${_param:cluster_vip_address}
- port: 9696
+ port: ${_param:haproxy_neutron_port}
servers:
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node04_hostname}
host: ${_param:cluster_node04_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
- name: ${_param:cluster_node05_hostname}
host: ${_param:cluster_node05_address}
- port: 9696
- params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+ port: ${_param:haproxy_neutron_port}
+ params: ${_param:haproxy_neutron_check_params}
diff --git a/openssh/server/team/members/dpyzhov.yml b/openssh/server/team/members/dpyzhov.yml
new file mode 100644
index 0000000..2f72fe5
--- /dev/null
+++ b/openssh/server/team/members/dpyzhov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dpyzhov:
+ enabled: true
+ name: dpyzhov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Dmitry Pyzhov
+ home: /home/dpyzhov
+ email: dpyzhov@mirantis.com
+ openssh:
+ server:
+ user:
+ dpyzhov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpCEigzaCPNPSuy0GMef/wsyGvBXjbZLxg4eR7oVKmRDsT01sjOFDgabwSBcbkvc7jeWw3RcxC8Upyhq2ADzwFSh+9AXRPbX1R2GxW85SYWg6xz4gFaM8CJ4XUT3S3lnhJ796xUSG9jOIe/pEk9L/4F41uzX8YSwQkGoio2j6za34ZWEVqDNNZt+PVC4woJjuw6r4jBZiEKWuVONeSLJeVwMwc9vwz1kED89OP3zenGknCY5PvM59CrcKHdVzseqHtzMW89nHTTAPTRPWX+07IgNWpI+IRB1KDbtRmeFpuLUwObfxzWqCDc2vpL6UF6uyIVEzLNBSSU4s0lmu0nyEM/uT5hpt/pchl50lfVBrIj+G3wIG+yy/sB4xddVNB5XxwiChxS1pkXgWx6apsOgrixdsVsw5sqRmYwecm3bqL2GFEl1UmLs3fdDyAfsG8uz/OyDl5I48LBZmklriDE6QB+vOG4n1BHPUkwiF2LeXf3JtUrBPhe7oe80xUVxPXjxZqtIHp2Tooj3u9TK5Wd00yOj4uGMyJoQdICSDqt/BATkTQ4a/JMhBGEb5GC6KuuEAIwfV7DnrDW+jyiV7JJ8GUHGbg3KKVPv7jCVcCnww6icywMClnFuAy+yagiq5DxYFkdk9wa1psbxpQKSXFBOO+iWqOYJoiIFwgSiujdM8ZfQ== dpyzhov@mac-pro-2017
+ user: ${linux:system:user:dpyzhov}
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index 6541e34..9921b5b 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -7,6 +7,7 @@
- system.openssh.server.team.members.jcach
- system.openssh.server.team.members.psvimbersky
- system.openssh.server.team.members.gzimin
+- system.openssh.server.team.members.dpyzhov
parameters:
_param:
linux_system_user_sudo: true