Merge pull request #4 from ahelal/feature/fix

Feature/fix
ahelal · Jun 1, 2016 · 01a7acd · 01a7acd
2 parents 6a8fa41 + 4176da4
commit 01a7acd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -65,8 +65,9 @@ concourseci_worker_name                     : "{{ inventory_hostname }}"
 ## Concourse garden linux
 concourseci_garden_listen                   : "127.0.0.1:7777"
 concourseci_garden_log_level                : "info" # [debug|info|error|fatal] 
-## Garden Container Networking              
+# concourseci_peer_ip                       # IP used to reach this worker from the ATC nodes. If omitted, the worker will be forwarded through the SSH connection to the TSA.
 # concourseci_garden_network_pool           # Network range to use for dynamically allocated container subnets. (default: 10.254.0.0/22)
+# concourseci_garden_max_containers         # Maximum number of containers that can be created. (default: )
 # concourseci_garden_graph_cleanup_threshold_in_megabytesDirectory # Disk usage of the graph dir at which cleanup should trigger, or -1 to disable graph cleanup. (default: -1)
 
 ## PostgreSQL

diff --git a/tasks/install.yml b/tasks/install.yml
@@ -19,15 +19,3 @@
     src="{{ concourseci_bin_dir }}/{{ concourseci_binary_file }}"
     dest="{{ concourseci_bin_dir }}/concourse"
     state="link"
-
-- name: Install | Concourse web start script
-  template:
-    src="concourse-web.j2"
-    dest="{{ concourseci_bin_dir }}/concourse-web"
-    mode=0755
-
-- name: Install | Concourse worker start script
-  template:
-    src="concourse-worker.j2"
-    dest="{{ concourseci_bin_dir }}/concourse-worker"
-    mode=0755
diff --git a/tasks/web.yml b/tasks/web.yml
@@ -1,5 +1,11 @@
 ---
 
+- name: web | Concourse web start script
+  template:
+    src="concourse-web.j2"
+    dest="{{ concourseci_bin_dir }}/concourse-web"
+    mode=0755
+
 - name: web | Copy session public key
   copy:
     content="{{ concourseci_key_session_public }}"

diff --git a/tasks/worker.yml b/tasks/worker.yml
@@ -1,5 +1,11 @@
 ---
 
+- name: worker | Concourse worker start script
+  template:
+    src="concourse-worker.j2"
+    dest="{{ concourseci_bin_dir }}/concourse-worker"
+    mode=0755
+
 - name: worker | Copy session public key
   copy:
     content="{{ concourseci_key_session_public }}"
@@ -28,7 +34,7 @@
     owner="{{ concourseci_user }}"
     group="{{ concourseci_group }}"
 
-- name: web | Copy worker private key
+- name: worker | Copy worker private key
   copy:
     content="{{ concourseci_key_worker_private }}"
     dest="{{ concourseci_key_worker_path }}"

diff --git a/templates/concourse-web.j2 b/templates/concourse-web.j2
@@ -4,7 +4,7 @@
 {% if value != 'omit' %}--{{ option }}={{ value }}{% endif %}
 {% endmacro %}
 
-{{ concourseci_bin_dir }}/concourse web \
+exec {{ concourseci_bin_dir }}/concourse web \
 {# General config #}
   {{ build_option("external-url", concourseci_external_url) }}\
   {{ build_option("oauth-base-url", concourseci_oauth_base_url | default("omit")) }}\

diff --git a/templates/concourse-worker.j2 b/templates/concourse-worker.j2
@@ -4,7 +4,7 @@
 {% if value != 'omit' %}--{{ option }}={{ value }}{% endif %}
 {% endmacro %}
 
-{{ concourseci_bin_dir }}/concourse worker \
+exec {{ concourseci_bin_dir }}/concourse worker \
 {# General config #}
   {{ build_option("name", concourseci_worker_name) }}\
   {{ build_option("work-dir", concourseci_worker_dir) }}\
@@ -13,11 +13,13 @@
   {{ build_option("tsa-port", concourseci_tsa_bind_port ) }}\
   {{ build_option("tsa-public-key", concourseci_key_tsa_path + ".pub" ) }}\
   {{ build_option("tsa-worker-private-key", concourseci_key_worker_path  ) }}\
+  {{ build_option("peer_ip", concourseci_peer_ip | default("omit")) }}\
 {# Garden config #}
   {{ build_option("garden-log-level", concourseci_garden_log_level) }}\
   {{ build_option("garden-graph-cleanup-threshold-in-megabytes", concourseci_garden_graph_cleanup_threshold_in_megabytes| default("omit")) }}\
 {# Garden Container Networking config #}
   {{ build_option("garden-network-pool", concourseci_garden_network_pool| default("omit")) }}\
+  {{ build_option("garden-max-containers", concourseci_garden_max_containers| default("omit")) }}\
 {# Redirect to logs #}
   &>> {{ concourseci_log_worker }}
 
@@ -66,9 +68,6 @@
 #          --garden-network-plugin=                       Path to network plugin binary.
 #          --garden-network-plugin-extra-arg=             Extra argument to pass to the network plugin. Can be specified multiple times.
 #
-#    Limits:
-#          --garden-max-containers=                       Maximum number of containers that can be created. (default: 0)
-#
 #    Metrics:
 #          --garden-metrics-emission-interval=            Interval on which to emit metrics. (default: 1m)
 #          --garden-dropsonde-origin=                     Origin identifier for Dropsonde-emitted metrics. (default: garden-linux)