use consul for swarm, update swarm to 1.0.0

Author: anandkumarpatel

ansible/group_vars/all.yml

@@ -44,6 +44,10 @@ pg_database: astral
 # charon
 charon_port: 53
 
+# consul
+consul_host_address: "{{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}"
+consul_api_port: 8500
+
 # datadog
 datadog_api_key: 6488896fe0c811965ef233b96809d70d
 datadog_host_address: "{{ ansible_default_ipv4.address }}"
@@ -102,4 +106,4 @@ shiva_port: 3000
 
 # swarm
 swarm_master_port: 2375
-
+swarm_host_address: "{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}"

ansible/group_vars/alpha-api.yml

@@ -50,8 +50,8 @@ container_envs: >
   -e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
   -e DOCKER_IMAGE_BUILDER_WEAVE_PATH={{ weave_path }}
-  -e SWARM_HOST=http://{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}:2375
-  -e CONTAINER_MEMORY_LIMIT_BYTES=100000000
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
+
 container_run_opts: >
   -h {{ name }}
   -d

ansible/group_vars/alpha-consul.yml

@@ -20,7 +20,7 @@ container_run_opts: >
   -p {{ ansible_default_ipv4.address }}:8302:8302
   -p {{ ansible_default_ipv4.address }}:8302:8302/udp
   -p {{ ansible_default_ipv4.address }}:8400:8400
-  -p {{ ansible_default_ipv4.address }}:8500:8500
+  -p {{ ansible_default_ipv4.address }}:{{ consul_api_port }}:{{ consul_api_port }}
   --restart=always
 
 container_run_args: >

ansible/group_vars/alpha-swarm-deamon.yml

@@ -2,7 +2,7 @@ name: "swarm-deamon"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 0.4.0
+container_tag: 1.0.0
 
 # container_kill_start vars
 log_driver: json-file
@@ -13,4 +13,4 @@ container_run_opts: >
 container_run_args: >
   join
    --addr={{ ansible_default_ipv4.address }}:{{ docker_port }}
-  token://{{ swarm_token }}
+  consul://{{ consul_host_address }}:{{ consul_api_port }}/swarm

ansible/group_vars/alpha-swarm-manager.yml

@@ -2,7 +2,7 @@ name: "swarm-manager"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 0.4.0
+container_tag: 1.0.0
 
 # container_kill_start vars
 log_driver: json-file
@@ -18,4 +18,4 @@ container_run_args: >
   --tlscacert={{ docker_ca_path }}
   --tlscert={{ docker_cert_path }}
   --tlskey={{ docker_key_path }}
-  token://{{ swarm_token }}
+  consul://{{ consul_host_address }}:{{ consul_api_port }}/swarm

ansible/group_vars/alpha-workers.yml

@@ -46,8 +46,7 @@ container_envs: >
   -e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
   -e DOCKER_IMAGE_BUILDER_WEAVE_PATH={{ weave_path }}
-  -e SWARM_HOST=http://{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}:2375
-  -e CONTAINER_MEMORY_LIMIT_BYTES=100000000
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >
   -h {{ name }}

ansible/roles/docker/tasks/main.yml

@@ -38,14 +38,9 @@
    update_cache: yes
    state: present
 
-- name: get org id
-  sudo: yes
-  when: docker_config == "docks"
-  shell: "cut -d, -f 1 /opt/runnable/host_tags"
-  register: org_id
-
 - name: copy docker config file
   sudo: yes
+  when: docker_config == "runnable"
   template:
     src={{ docker_config }}
     dest=/etc/default/docker