Merge remote-tracking branch 'origin/master' into link-rebased

Author: Bryan Kendall

ansible/consul-services.yml

@@ -0,0 +1,7 @@
+---
+- hosts: rabbitmq
+- hosts: redis
+
+- hosts: vault
+  roles:
+  - { role: consul-services }

ansible/consul-values.yml

@@ -1,15 +1,32 @@
 ---
-- hosts: "{{ target }}"
+- hosts: consul
+  vars_files:
+    - "group_vars/alpha-consul.yml"
   tasks:
-  - name: make sure `jq` is present
-    apt:
-      name=jq
-      state=present
+    - name: make sure httplib2 is installed
+      sudo: yes
+      apt: package=python-httplib2 state=present
 
-  - name: get versions in ansible
-    script: getVersions {{ ansible_default_ipv4.address }}
-    register: versions_result
+    - name: put values into consul
+      run_once: true
+      when: write_values is defined
+      uri:
+        method=PUT
+        url=http://{{ ansible_default_ipv4.address }}:8500/v1/kv/{{ item.key }}
+        body="{{ item.value }}"
+      with_items: "{{ consul_seed }}"
 
-  - name: print versions to stdout
-    debug:
-      msg="Versions in Consul\n{{ versions_result.stdout }}"
+    - name: get values from consul
+      run_once: true
+      when: read_values is defined
+      uri:
+        method=GET
+        url=http://{{ ansible_default_ipv4.address }}:8500/v1/kv/{{ item.key }}
+      with_items: "{{ consul_seed }}"
+      register: values
+
+    - name: print values to screen
+      run_once: true
+      when: read_values is defined
+      debug: msg='{{ item.item.key }}: {{ item.json[0].Value | b64decode }}'
+      with_items: "{{ values.results }}"

ansible/gamma-hosts/hosts

@@ -20,6 +20,14 @@ api
 [api]
 gamma-api
 
+[consul]
+gamma-services
+gamma-api
+gamma-web
+
+[vault]
+gamma-services
+
 [worker]
 gamma-api
 

ansible/gamma-hosts/variables

@@ -36,9 +36,9 @@ palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
 
 [registry:vars]
 registry_s3_access_key=AKIAJZQHOFYKTZP52XCQ
-registry_s3_bucket=runnableimages.gamma
+registry_s3_bucket=runnableimages.beta
 registry_s3_secret_key=iOKNwff7HhUnTmHxt1HrJj1lUkrccZTqWvrKi54C
-registry_s3_region=us-west-2
+registry_s3_region=us-east-1
 
 [shiva:vars]
 aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q

ansible/group_vars/all.yml

@@ -1,6 +1,7 @@
 ---
 # registry settings
 registry_env: "prod"
+registry_port: 80
 
 # for docker stop old container
 stop_time: 5

ansible/group_vars/alpha-api.yml

@@ -31,7 +31,7 @@ container_envs: >
   -e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
   -e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
   -e MONGO_REPLSET_NAME={{ api_mongo_replset_name }}
-  -e NAVI_HOST=http://{{ navi_host_addressname }}:{{ navi_port }}
+  -e NAVI_HOST=http://{{ navi_host_address }}:{{ navi_port }}
   -e NEO4J={{ api_neo4j_protocol }}{{ api_neo4j_auth }}@{{ neo4j_host_address }}:{{ api_neo4j_port }}
   -e NEW_RELIC_APP_NAME={{ api_new_relic_app_name }}
   -e NEW_RELIC_LICENSE_KEY={{ new_relic_license_key }}

ansible/group_vars/alpha-consul.yml

@@ -32,3 +32,23 @@ container_run_args: >
   -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 %}
+
+# some seed values
+# pulled 2015/16/11 - Bryan
+consul_seed:
+  - key: node/env
+    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

ansible/group_vars/alpha-web.yml

@@ -34,4 +34,4 @@ container_run_opts: >
   -h {{ name }}
   -d
   -P
-  {{ container_envs }}"
+  {{ container_envs }}

ansible/group_vars/alpha-workers.yml

@@ -28,7 +28,7 @@ container_envs: >
   -e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
   -e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
   -e MONGO_REPLSET_NAME={{ api_mongo_replset_name }}
-  -e NAVI_HOST=http://{{ navi_host_addressname }}:{{ navi_port }}
+  -e NAVI_HOST=http://{{ navi_host_address }}:{{ navi_port }}
   -e NEO4J={{ api_neo4j_protocol }}{{ api_neo4j_auth }}@{{ neo4j_host_address }}:{{ api_neo4j_port }}
   -e NEW_RELIC_APP_NAME={{ api_new_relic_app_name }}
   -e NEW_RELIC_LICENSE_KEY={{ new_relic_license_key }}

ansible/roles/consul-services/tasks/main.yml

@@ -0,0 +1,37 @@
+---
+- name: make /etc/consul.d folder
+  sudo: yes
+  file:
+    path=/etc/consul.d
+    state=directory
+
+- name: remove all current configs
+  sudo: yes
+  shell: rm -f /etc/consul.d/*.json
+
+- name: put service files in place
+  sudo: yes
+  template:
+    dest=/etc/consul.d/{{ item.name }}.json
+    src=service.json
+  with_items:
+    - name: 'datadog'
+      host_address: '{{ datadog_host_address }}'
+      tags: ['master']
+      port: '{{ datadog_port }}'
+    - name: 'rabbitmq'
+      host_address: '{{ rabbit_host_address }}'
+      tags: ['master']
+      port: '{{ rabbit_port }}'
+    - name: 'redis'
+      host_address: '{{ redis_host_address }}'
+      tags: ['master']
+      port: '{{ redis_port }}'
+    - name: 'registry'
+      host_address: '{{ registry_host }}'
+      tags: ['master']
+      port: '{{ registry_port }}'
+
+- name: send consul SIGUP to reload services
+  sudo: yes
+  shell: pkill --signal SIGHUP consul