minor fixes

roles/common/defaults/main.yaml

@@ -1,7 +1,8 @@
 ---
 conductor_service: "conductor-server-{{ infrastructure }}"
 conductor_ui_service: "conductor-ui-{{ infrastructure }}"
-conductor_service_url: "http://{{ conductor_service }}:8080/api"
+conductor_service_url: "http://{{ conductor_service }}:8080/api/"
+conductor_service_health_url: "http://{{ conductor_service }}:8080/health"
 target_path: "/tmp/conductor_stack_{{ infrastructure }}"
 conductor_network: conductor-network
 conductor_db: postgres

roles/conductor/templates/conductor-swarm.yaml.j2

@@ -29,8 +29,10 @@ services:
 
   {{ conductor_ui_service }}:
     environment:
-      - WF_SERVER="{{ conductor_service_url }}"
+      - WF_SERVER={{ conductor_service_url }}
+{% if conductor_auth is defined %}
       - AUTH_CONFIG_PATH=/app/config/auth.config
+{% endif %}
     image: "{{ conductor_ui_image }}"
     networks:
       - {{ conductor_network }}

roles/pep/templates/nginx.default.conf.nopep.j2

@@ -15,6 +15,7 @@ server {
   server_name conductor-server;
 
   location / {
+    proxy_set_header Host $host;
     proxy_pass http://_conductor-server;
   }
 

roles/workers/defaults/main.yaml

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

roles/workers/templates/conductor-workers-swarm.yaml.j2

@@ -4,7 +4,8 @@ services:
 {% for workers in conductor_workers %}
   {{ workers.service }}:
     environment:
-      CONDUCTOR_SERVER: {{ conductor_workers_server }}
+      CONDUCTOR_SERVER: {{ conductor_service_url }}
+      CONDUCTOR_HEALTH: {{ conductor_service_health_url }}
     configs:
       - source: {{workers.service}}-config
         target: /app/config.cfg