Merge pull request #216 from CodeNow/add-mavis-to-sauron

Add mavis to sauron, move sauron off the docks

Author: anandkumarpatel

ansible/beta-hosts/hosts

@@ -76,6 +76,9 @@ beta-redis
 [redis-slave]
 beta-redis-slave
 
+[sauron]
+beta-services
+
 [shiva]
 beta-services
 
@@ -110,6 +113,7 @@ rabbitmq
 redis
 redis-slave
 registry
+sauron
 shiva
 swarm-manager
 web

ansible/gamma-hosts/hosts

@@ -67,6 +67,9 @@ gamma-redis
 [redis-slave]
 gamma-redis-slave
 
+[sauron]
+gamma-services
+
 [shiva]
 gamma-services
 
@@ -96,6 +99,7 @@ mavis
 optimus
 rabbitmq
 eru
+sauron
 shiva
 swarm-manager
 

ansible/group_vars/all.yml

@@ -102,9 +102,6 @@ rabbit_port: 54321
 redis_host_address: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
 redis_port: 6379
 
-# sauron
-weave_path: "/usr/local/bin/weave"
-
 # shiva
 pg_user: shiva
 shiva_port: 3000

ansible/group_vars/alpha-api.yml

@@ -49,7 +49,6 @@ container_envs: >
   -e ROLLBAR_KEY={{ api_rollbar_key }}
   -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://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >

ansible/group_vars/alpha-sauron.yml

@@ -1,14 +1,33 @@
 # upstart template variables
 name: sauron
 
-app_name: "{{ name }}"
-app_repo: "git@github.com:CodeNow/{{ name }}.git"
-
-enviroment_vars:
-  LOGGLY_TOKEN: "{{ loggly_token }}"
-  RABBITMQ_HOSTNAME: "{{ rabbit_host_address }}"
-  RABBITMQ_PASSWORD: "{{ rabbit_password }}"
-  RABBITMQ_PORT: "{{ rabbit_port }}"
-  RABBITMQ_USERNAME: "{{ rabbit_username }}"
-  REDIS_IPADDRESS: "{{ redis_host_address }}"
-  REDIS_PORT: "{{ redis_port }}"
+container_image: "registry.runnable.com/runnable/{{ name }}"
+container_tag: "{{ git_branch }}"
+repo: "git@github.com:CodeNow/{{ name }}.git"
+node_version: "4.2.2"
+npm_version: "2.14.7"
+
+weave_path: "/bin/weave"
+docker_path: "/bin/docker"
+
+dockerfile_pre_install_commands: [
+  "curl -L https://get.docker.com/builds/Linux/x86_64/docker-1.6.2 -o {{ docker_path }}",
+  "chmod a+x {{ docker_path }}",
+  "curl -L https://github.com/weaveworks/weave/releases/download/v1.3.1/weave -o {{ weave_path }}",
+  "chmod a+x {{ weave_path }}"
+]
+
+container_envs: >
+  -e LOGGLY_TOKEN="{{ loggly_token }}"
+  -e MAVIS_URL="http://{{ mavis_hostname }}"
+  -e RABBITMQ_HOSTNAME="{{ rabbit_host_address }}"
+  -e RABBITMQ_PASSWORD="{{ rabbit_password }}"
+  -e RABBITMQ_PORT="{{ rabbit_port }}"
+  -e RABBITMQ_USERNAME="{{ rabbit_username }}"
+  -e WEAVE_PATH={{ weave_path }}
+
+container_run_opts: >
+  -h {{ name }}
+  -d
+  -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro
+  {{ container_envs }}

ansible/group_vars/alpha-workers.yml

@@ -45,7 +45,6 @@ container_envs: >
   -e ROLLBAR_KEY={{ api_rollbar_key }}
   -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://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >

ansible/oneOffScripts/killWeaveContainers.yml

@@ -0,0 +1,7 @@
+- hosts: docks
+  gather_facts: no
+  serial: 1
+  tasks:
+  - name: kill weave containers
+    sudo: yes
+    shell: 'sudo docker ps | grep weaveworks/weave | cut -d" " -f 1 | xargs sudo docker kill'

ansible/oneOffScripts/removeDockService.yml

@@ -0,0 +1,22 @@
+- hosts: docks
+  gather_facts: no
+  tasks:
+  - fail: msg="`name` needs to be defined for this role"
+    when: name is not defined
+
+  - name: stop service
+    sudo: yes
+    service:
+      name={{ name }}
+      state=stopped
+
+  - name: remove files
+    sudo: yes
+    file:
+      path={{ item }}
+      state=absent
+    with_items:
+      - /etc/init/{{ name }}.conf
+      - /etc/init/{{ name }}.conf.bak
+      - /etc/init/{{ name }}.override
+      - /opt/runnable/{{ name }}

ansible/palantiri.yml

@@ -6,5 +6,6 @@
     - "group_vars/alpha-palantiri.yml"
   roles:
   - { role: notify, tags: "notify" }
+  - { role: docker_client }
   - { role: builder, tags: "build" }
   - { role: container_kill_start, tags: "deploy" }

ansible/prod-hosts/hosts

@@ -85,6 +85,9 @@ alpha-redis-slave
 [registry]
 alpha-registry
 
+[sauron]
+alpha-api-old
+
 [shiva]
 alpha-api-old
 
@@ -118,6 +121,7 @@ rabbitmq
 redis
 redis-slave
 registry
+sauron
 shiva
 swarm-manager
 web