consul_value role and division

Bryan Kendall · Bryan Kendall · commit 59bbde795c9c · 2015-11-23T17:10:15.000-08:00
diff --git a/ansible/charon.yml b/ansible/charon.yml
@@ -1,9 +1,11 @@
 ---
 - hosts: redis
+- hosts: consul
 
 - hosts: docks
   vars_files:
     - "group_vars/alpha-charon.yml"
   roles:
   - { role: notify, tags: "notify" }
   - { role: git_node_service, tags: "deploy" }
+  - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/docker-listener.yml b/ansible/docker-listener.yml
@@ -1,12 +1,14 @@
 ---
 - hosts: rabbitmq
 - hosts: redis
+- hosts: consul
 
 - hosts: docks
   vars_files:
-    - "group_vars/alpha-docker-listener.yml"
+    - group_vars/alpha-docker-listener.yml
   roles:
-  - { role: notify, tags: "notify" }
+  - { role: notify, tags: [notify] }
   - { role: build_essential }
   - { role: docker_client }
-  - { role: git_node_service, tags: "deploy" }
+  - { role: git_node_service, tags: [deploy] }
+  - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/filibuster.yml b/ansible/filibuster.yml
@@ -1,8 +1,10 @@
 ---
+- hosts: consul
+
 - hosts: docks
   vars_files:
     - "group_vars/alpha-filibuster.yml"
   roles:
   - { role: notify, tags: "notify" }
   - { role: git_node_service, tags: "deploy" }
-
+  - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -108,3 +108,7 @@ swarm_master_port: 2375
 navi_mongo_database: navi
 navi_mongo_host_address: "{{ hostvars[groups['mongo-navi'][0]]['ansible_default_ipv4']['address'] }}"
 navi_mongo_port: 27017
+
+# consul
+consul_hostname: "{{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}"
+consul_port: 8500
diff --git a/ansible/group_vars/alpha-charon.yml b/ansible/group_vars/alpha-charon.yml
@@ -1,14 +1,19 @@
-name: "charon"
+name: charon
 app_name: "{{ name }}"
-app_repo: "git@github.com:CodeNow/{{ name }}.git"
+app_repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: ["{{ charon_port }}"]
 
 enviroment_vars:
   API_HOST: "{{ api_hostname }}"
-  API_TOKEN: "51c61b779f3de616a9639cfc44a22c79fbd8e328"
+  API_TOKEN: 51c61b779f3de616a9639cfc44a22c79fbd8e328
   DATADOG_HOST: "{{ datadog_host_address }}"
   DATADOG_PORT: "{{ datadog_port }}"
   DOMAIN_FILTER: "{{ user_content_domain }}"
   PORT: "{{ hosted_ports[0] }}"
   REDIS_HOST: "{{ redis_host_address }}"
   REDIS_PORT: "{{ redis_port }}"
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -32,10 +32,10 @@ container_run_args: >
   -config-dir /etc/consul.d
   -client 0.0.0.0
   -recursor 8.8.8.8
-  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
+  {% if consul_hostname == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
   -data-dir /data
-  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
-  {% if hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] != ansible_default_ipv4.address %}-retry-join {{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}{% endif %}
+  {% if consul_hostname == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
+  {% if consul_hostname != ansible_default_ipv4.address %}-retry-join {{ consul_hostname }}{% endif %}
   > /var/log/consul.log 2>&1
 
 # some seed values
@@ -45,15 +45,3 @@ consul_seed:
     value: "{{ node_env }}"
   - key: api/hostname
     value: "{{ api_hostname }}"
-  - key: image-builder/version
-    value: d1.6.2-v4.0.0
-  - key: docker-listener/version
-    value: v1.0.0
-  - key: filibuster/version
-    value: v0.1.6
-  - key: krain/version
-    value: v0.1.0
-  - key: sauron/version
-    value: v2.0.3
-  - key: charon/version
-    value: v2.0.2
diff --git a/ansible/group_vars/alpha-docker-listener.yml b/ansible/group_vars/alpha-docker-listener.yml
@@ -1,8 +1,8 @@
 name: docker-listener
 
 # upstart template variables
-app_name: "docker-listener"
-app_repo: "git@github.com:CodeNow/docker-listener.git"
+app_name: docker-listener
+app_repo: git@github.com:CodeNow/docker-listener.git
 
 enviroment_vars:
   LOGGLY_TOKEN: "{{ loggly_token }}"
@@ -12,3 +12,8 @@ enviroment_vars:
   RABBITMQ_USERNAME: "{{ rabbit_username }}"
   REDIS_IPADDRESS: "{{ redis_host_address }}"
   REDIS_PORT: "{{ redis_port }}"
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/group_vars/alpha-filibuster.yml b/ansible/group_vars/alpha-filibuster.yml
@@ -7,4 +7,9 @@ app_name: "filibuster"
 app_repo: "git@github.com:Runnable/Filibuster.git"
 node_env: "{{ filibuster_env }}"
 
-enviroment_vars: {}
+enviroment_vars: {}
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/group_vars/alpha-image-builder.yml b/ansible/group_vars/alpha-image-builder.yml
@@ -1,7 +1,12 @@
-app_name: "image-builder"
+app_name: image-builder
 name: "{{ app_name }}"
 # namespace (can include "registry.runnable.com:")
 image_builder_docker_namespace: runnable/image-builder
 
 # we need to push this
 do_not_push: false
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/group_vars/alpha-krain.yml b/ansible/group_vars/alpha-krain.yml
@@ -4,8 +4,13 @@ name: krain
 krain_env: default
 
 # upstart template variables
-app_name: "krain"
-app_repo: "git@github.com:CodeNow/krain.git"
+app_name: krain
+app_repo: git@github.com:CodeNow/krain.git
 node_env: "{{ krain_env }}"
 
-enviroment_vars: {}
+enviroment_vars: {}
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml
@@ -2,7 +2,7 @@
 name: sauron
 
 app_name: "{{ name }}"
-app_repo: "git@github.com:CodeNow/{{ name }}.git"
+app_repo: git@github.com:CodeNow/{{ name }}.git
 
 enviroment_vars:
   LOGGLY_TOKEN: "{{ loggly_token }}"
@@ -11,4 +11,9 @@ enviroment_vars:
   RABBITMQ_PORT: "{{ rabbit_port }}"
   RABBITMQ_USERNAME: "{{ rabbit_username }}"
   REDIS_IPADDRESS: "{{ redis_host_address }}"
-  REDIS_PORT: "{{ redis_port }}"
+  REDIS_PORT: "{{ redis_port }}"
+
+# consul values
+consul_values:
+  - key: "{{ name }}/version"
+    value: "{{ git_branch }}"
diff --git a/ansible/image-builder.yml b/ansible/image-builder.yml
@@ -1,8 +1,11 @@
 ---
+- hosts: consul
+
 - hosts: docks
   vars_files:
     - "group_vars/alpha-image-builder.yml"
   roles:
   - { role: notify, tags: "notify" }
   - { role: node, tags: "setup"  }
   - { role: image-builder, tags: "deploy" }
+  - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/krain.yml b/ansible/krain.yml
@@ -1,8 +1,11 @@
 ---
+- hosts: consul
+
 - hosts: docks
   vars_files:
     - "group_vars/alpha-krain.yml"
   roles:
   - { role: notify, tags: "notify" }
   - { role: build_essential }
   - { role: git_node_service, tags: "deploy" }
+  - { role: consul_value, tags: [deploy, consul_value] }
diff --git a/ansible/roles/consul_value/tasks/main.yml b/ansible/roles/consul_value/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+- name: make sure httplib2 is installed
+  sudo: yes
+  apt: package=python-httplib2 state=present
+
+- name: put values into consul
+  run_once: true
+  when: consul_hostname is defined and consul_port is defined and consul_values is defined
+  uri:
+    method=PUT
+    url=http://{{ consul_hostname }}:{{ consul_port }}/v1/kv/{{ item.key }}
+    body="{{ item.value }}"
+  with_items: "{{ consul_values }}"
diff --git a/ansible/sauron.yml b/ansible/sauron.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: rabbitmq
 - hosts: redis
+- hosts: consul
 
 - hosts: docks
   vars_files:
@@ -9,3 +10,4 @@
   - { role: notify, tags: "notify" }
   - { role: sauron, tags: "notify" }
   - { role: git_node_service, tags: "deploy" }
+  - { role: consul_value, tags: [deploy, consul_value] }
