Merge remote-tracking branch 'origin/master' into add-big-poppa

Author: Nathan219

ansible/api-core.yml

@@ -1,6 +1,5 @@
 ---
 - hosts: mongodb
-- hosts: neo4j
 - hosts: navi
 - hosts: charon
 - hosts: rabbitmq

ansible/app-services.yml

@@ -1,7 +1,6 @@
 - include: detention.yml git_branch="{{ detention_branch }}"
 - include: drake.yml git_branch="{{ drake_branch }}"
 - include: eru.yml git_branch="{{ eru_branch }}"
-- include: mavis.yml git_branch="{{ mavis_branch }}"
 - include: metis.yml git_branch="{{ astral_branch }}"
 - include: shiva.yml git_branch="{{ astral_branch }}"
 # run with: `--extra-vars "@current_versions.yml"`

ansible/delta-hosts/hosts

@@ -12,8 +12,6 @@ delta-mongo-a
 delta-mongo-b
 delta-mongo-c
 
-[neo4j]
-delta-neo4j
 
 [ingress]
 delta-ingress
@@ -70,9 +68,6 @@ delta-app-services
 [khronos]
 delta-dock-services
 
-[mavis]
-delta-dock-services
-
 [optimus]
 delta-dock-services
 
@@ -136,11 +131,9 @@ github-varnish
 hipache
 ingress
 khronos
-mavis
 metis
 mongodb
 navi
-neo4j
 optimus
 pheidi
 rabbitmq

ansible/delta-hosts/variables

@@ -8,7 +8,6 @@ api_mixpanel_app_id=57260a5b6fc972e9c69184882efd009e
 api_mongo_auth=api:72192e5a-a5e1-11e5-add9-0270db32f7ad
 api_mongo_database=delta
 api_mongo_replset_name=delta-rs0
-api_neo4j_auth=neo4j:oqGlRV1KTpaqbHDkdlJz
 api_new_relic_app_name=delta-api-production
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_workers_rollbar_key=3edfe8fe4fd640ae9fdbbe08fcb9f121
@@ -151,7 +150,6 @@ sg_hipache=sg-7fd7fb1b
 sg_mongo=sg-00d7fb64
 sg_nat=sg-3082cc54
 sg_navi=sg-e5d7fb81
-sg_neo4j=sg-a9d0fccd
 sg_rabbit=sg-92d1fdf6
 sg_rds=sg-65d2fe01
 sg_redis=sg-6ed2fe0a

ansible/docker-files/main/Dockerfile

@@ -8,7 +8,6 @@ WORKDIR /repos
 # clone repos for dockerfiles
 RUN git clone git@github.com:CodeNow/api.git
 RUN git clone git@github.com:CodeNow/runnable-angular.git
-RUN git clone git@github.com:CodeNow/mavis.git
 RUN git clone git@github.com:CodeNow/devops-scripts.git
 # copy things into places
 RUN mv $REPO_BASE/devops-scripts/ssh/config /root/.ssh/config

ansible/epsilon-hosts/hosts

@@ -10,9 +10,6 @@ epsilon-userland
 [mongodb]
 epsilon-mongo
 
-[neo4j]
-epsilon-neo4j
-
 [api_group:children]
 worker
 api
@@ -68,9 +65,6 @@ epsilon-app-services
 [khronos]
 epsilon-dock-services
 
-[mavis]
-epsilon-dock-services
-
 [optimus]
 epsilon-dock-services
 
@@ -127,11 +121,9 @@ eru
 github-varnish
 hipache
 khronos
-mavis
 metis
 mongodb
 navi
-neo4j
 optimus
 rabbitmq
 redis

ansible/epsilon-hosts/variables

@@ -8,7 +8,6 @@ api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
 api_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 api_mongo_database=epsilon
 api_mongo_replset_name=epsilon-rs0
-api_neo4j_auth=neo4j:oqGlRV1KTpaqbHDkdlJz
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_workers_rollbar_key=3edfe8fe4fd640ae9fdbbe08fcb9f121
 api_s3_context_bucket=runnable.context.resources.production-beta
@@ -129,7 +128,6 @@ sg_hipache="sg-0822e46f"
 sg_mongo="sg-ec22e48b"
 sg_nat="sg-c7dd1aa0"
 sg_navi="sg-4423e523"
-sg_neo4j="sg-0d23e56a"
 sg_rabbit="sg-ef23e588"
 sg_rds="sg-da23e5bd"
 sg_redis="sg-b923e5de"

ansible/filibuster.yml

@@ -12,9 +12,6 @@ gamma-mongo-a
 gamma-mongo-b
 gamma-mongo-c
 
-[neo4j]
-gamma-neo4j
-
 [api_group:children]
 worker
 api
@@ -63,9 +60,6 @@ gamma-app-services
 [khronos]
 gamma-dock-services
 
-[mavis]
-gamma-dock-services
-
 [optimus]
 gamma-dock-services
 
@@ -135,11 +129,9 @@ github-varnish
 hipache
 ingress
 khronos
-mavis
 metis
 mongodb
 navi
-neo4j
 optimus
 pheidi
 rabbitmq

ansible/gamma-hosts/hosts

@@ -8,7 +8,6 @@ api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
 api_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 api_mongo_database=gamma
 api_mongo_replset_name=gamma-rs0
-api_neo4j_auth=neo4j:oqGlRV1KTpaqbHDkdlJz
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_workers_rollbar_key=3edfe8fe4fd640ae9fdbbe08fcb9f121
 api_s3_context_bucket=runnable.context.resources.production-beta
@@ -134,7 +133,6 @@ sg_hipache=sg-e70c7883
 sg_mongo=sg-977a0df3
 sg_nat=sg-b595ffd1
 sg_navi=sg-45633421
-sg_neo4j=sg-ff60179b
 sg_rabbit=sg-44b7cb20
 sg_rds=sg-081e596c
 sg_redis=sg-477b0c23