changed naming of service to incorporate infrastructure

This commit is contained in:
Marco Lettere 2021-05-31 18:04:17 +02:00
parent c1db229a68
commit c4bb342b3f
11 changed files with 20 additions and 17 deletions

View File

@ -1,6 +1,8 @@
---
conductor_server: http://conductor-server:8080/api
target_path: "/tmp/conductor_stack"
conductor_service: "conductor-server-{{ infrastructure }}"
conductor_ui_service: "conductor-ui-{{ infrastructure }}"
conductor_service_url: "http://{{ conductor_service }}:8080/api"
target_path: "/tmp/conductor_stack_{{ infrastructure }}"
conductor_network: conductor-network
conductor_db: postgres
init_db: True

View File

@ -3,7 +3,7 @@ version: '3.6'
{% set clustered = (cluster_replacement is defined and cluster_replacement) or (cluster_check is defined and cluster_check) %}
services:
conductor-server:
{{ conductor_service }}:
environment:
- CONFIG_PROP={{ conductor_config }}
image: "{{ conductor_image }}"
@ -27,9 +27,9 @@ services:
logging:
driver: "journald"
conductor-ui:
{{ conductor_ui_service }}:
environment:
- WF_SERVER=http://conductor-server:8080/api/
- WF_SERVER="{{ conductor_service_url }}"
- AUTH_CONFIG_PATH=/app/config/auth.config
image: "{{ conductor_ui_image }}"
networks:

View File

@ -1,6 +1,4 @@
pep_port: 80
pep_replicas: 1
# hostnames to be used as vhosts
conductor_server_name: conductor-server
conductor_ui_server_name: conductor-ui
#pep_credentials: in vault

View File

@ -1,11 +1,11 @@
upstream _conductor-server {
ip_hash;
server conductor-server:8080;
server {{ conductor_service }}:8080;
}
upstream _conductor-ui {
ip_hash;
server conductor-ui:5000;
server {{ conductor_ui_service }}:5000;
}
map $http_authorization $source_auth {

View File

@ -1,11 +1,11 @@
upstream _conductor-server {
ip_hash;
server conductor-server:8080;
server {{ conductor_service }}:8080;
}
upstream _conductor-ui {
ip_hash;
server conductor-ui:5000;
server {{ conductor_ui_service}}:5000;
}
server {

View File

@ -5,7 +5,7 @@ services:
pep:
image: nginx:stable-alpine
networks:
- conductor-network
- {{ conductor_network }}
- haproxy-public
deploy:
replicas: 1
@ -29,7 +29,7 @@ services:
{% endif %}
networks:
conductor-network:
{{ conductor_network }}:
haproxy-public:
external: true
configs:

View File

@ -5,7 +5,7 @@ services:
pep:
image: nginx:stable-alpine
networks:
- conductor-network
- {{ conductor_network }}
ports:
- "{{ pep_port }}:80"
deploy:
@ -31,7 +31,7 @@ services:
{% endif %}
networks:
conductor-network:
{{ conductor_network }}:
configs:
nginxconf:

View File

@ -1,5 +1,5 @@
---
conductor_workers_server: http://conductor-server:8080/api
conductor_workers_server: "{{ conductor_service_url }}"
conductor_workers: [ { service: 'base', image: 'nubisware/nubisware-conductor-worker-py-base', replicas: 2, threads: 1, pollrate: 1 }]

View File

@ -1,5 +1,6 @@
---
- hosts: dev_infra
#- hosts: localhost
vars_files:
- roles/workers/defaults/smtp.yaml
- roles/pep/defaults/pep_credentials.yaml

View File

@ -1,5 +1,6 @@
---
- hosts: nw_cluster_infra
#- hosts: localhost
vars_files:
- roles/workers/defaults/smtp.yaml
- roles/pep/defaults/pep_credentials.yaml

View File

@ -1,5 +1,6 @@
---
- hosts: pre_infra
#- hosts: pre_infra
- hosts: localhost
vars_files:
- roles/workers/defaults/smtp.yaml
- roles/pep/defaults/pep_credentials.yaml