From 9d84efe1fb209cce07418ae8bf380debbe766c21 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Fri, 20 Nov 2020 16:37:14 +0100 Subject: [PATCH] added group_vars to differentiate stack name and conductor server address --- inventory/group_vars/nw_cluster.yaml | 3 +++ inventory/group_vars/pre_cluster.yaml | 3 +++ inventory/hosts.dev | 2 +- inventory/hosts.pre | 6 +++--- roles/cluster-replacement/defaults/main.yml | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 inventory/group_vars/nw_cluster.yaml create mode 100644 inventory/group_vars/pre_cluster.yaml diff --git a/inventory/group_vars/nw_cluster.yaml b/inventory/group_vars/nw_cluster.yaml new file mode 100644 index 0000000..7135987 --- /dev/null +++ b/inventory/group_vars/nw_cluster.yaml @@ -0,0 +1,3 @@ +--- +infrastructure: dev +conductor_workers_server: http://conductor-dev.int.d4science.net/api diff --git a/inventory/group_vars/pre_cluster.yaml b/inventory/group_vars/pre_cluster.yaml new file mode 100644 index 0000000..b982dd1 --- /dev/null +++ b/inventory/group_vars/pre_cluster.yaml @@ -0,0 +1,3 @@ +--- +infrastructure: pre +conductor_workers_server: https://conductor.pre.d4science.org/api diff --git a/inventory/hosts.dev b/inventory/hosts.dev index 2da607d..e48107d 100644 --- a/inventory/hosts.dev +++ b/inventory/hosts.dev @@ -2,4 +2,4 @@ nw_cluster [nw_cluster] -nubis1.int.d4science.net infrastructure=dev +nubis1.int.d4science.net diff --git a/inventory/hosts.pre b/inventory/hosts.pre index dc17bd1..795edbb 100644 --- a/inventory/hosts.pre +++ b/inventory/hosts.pre @@ -1,5 +1,5 @@ [pre_infra:children] -nw_cluster +pre_cluster -[nw_cluster] -docker-swarm1.int.d4science.net docker_swarm_manager_main_node=True infrastructure=pre +[pre_cluster] +docker-swarm1.int.d4science.net docker_swarm_manager_main_node=True diff --git a/roles/cluster-replacement/defaults/main.yml b/roles/cluster-replacement/defaults/main.yml index 905adae..ee1d13e 100644 --- a/roles/cluster-replacement/defaults/main.yml +++ b/roles/cluster-replacement/defaults/main.yml @@ -21,7 +21,7 @@ haproxy_docker_swarm_additional_networks: [] haproxy_docker_swarm_haproxy_constraints: - 'node.role == manager' -haproxy_docker_swarm_additional_services: [{ acl_name: 'conductor-server', acl_rule: 'hdr_dom(host) -i conductor-dev.int.d4science.net', stack_name: 'conductor', service_name: 'conductor-server', service_replica_num: '2', service_port: '8080', service_overlay_network: 'conductor-network', stick_sessions: False, stick_on_cookie: True, stick_cookie: 'JSESSIONID', stick_table: 'type ip size 2m expire 180m', balance_type: 'roundrobin', backend_options: '', http_check_enabled: True, http_check: 'meth GET uri /api/health ver HTTP/1.1 hdr Host localhost', http_check_expect: 'rstatus (2|3)[0-9][0-9]' }, { acl_name: 'conductor-ui', acl_rule: 'hdr_dom(host) -i conductorui-dev.int.d4science.net', stack_name: 'conductor', service_name: 'conductor-ui', service_replica_num: '2', service_port: '5000', service_overlay_network: 'conductor-network', stick_sessions: False, stick_on_cookie: True, stick_cookie: 'JSESSIONID', stick_table: 'type ip size 2m expire 180m', balance_type: 'roundrobin', backend_options: '', http_check_enabled: True, http_check: 'meth GET uri / ver HTTP/1.1 hdr Host localhost', http_check_expect: 'rstatus (2|3)[0-9][0-9]' }] +haproxy_docker_swarm_additional_services: [{ acl_name: 'conductor-server', acl_rule: 'hdr_dom(host) -i conductor-dev.int.d4science.net', stack_name: 'conductor-{{ infrastructure }}', service_name: 'conductor-server', service_replica_num: '2', service_port: '8080', service_overlay_network: 'conductor-network', stick_sessions: False, stick_on_cookie: True, stick_cookie: 'JSESSIONID', stick_table: 'type ip size 2m expire 180m', balance_type: 'roundrobin', backend_options: '', http_check_enabled: True, http_check: 'meth GET uri /api/health ver HTTP/1.1 hdr Host localhost', http_check_expect: 'rstatus (2|3)[0-9][0-9]' }, { acl_name: 'conductor-ui', acl_rule: 'hdr_dom(host) -i conductorui-dev.int.d4science.net', stack_name: 'conductor-{{ infrastructure }}', service_name: 'conductor-ui', service_replica_num: '2', service_port: '5000', service_overlay_network: 'conductor-network', stick_sessions: False, stick_on_cookie: True, stick_cookie: 'JSESSIONID', stick_table: 'type ip size 2m expire 180m', balance_type: 'roundrobin', backend_options: '', http_check_enabled: True, http_check: 'meth GET uri / ver HTTP/1.1 hdr Host localhost', http_check_expect: 'rstatus (2|3)[0-9][0-9]' }] # - { acl_name: 'service', acl_rule: 'hdr_dom(host) -i service.example.com', stack_name: 'stack', service_name: 'service', service_replica_num: '1', service_port: '9999', service_overlay_network: 'service-network', stick_sessions: False, stick_on_cookie: True, stick_cookie: 'JSESSIONID', stick_table: 'type ip size 2m expire 180m', balance_type: 'roundrobin', backend_options: '', http_check_enabled: True, http_check: 'meth HEAD uri / ver HTTP/1.1 hdr Host localhost', http_check_expect: 'rstatus (2|3)[0-9][0-9]', allowed_networks: '192.168.1.0/24 192.168.2.0/24' } haproxy_default_port: 80