Merge pull request #197 from CodeNow/cleanup-n-lineinfile

Cleanup n lineinfile

Author: bkendall

ansible/beta-hosts/variables

@@ -47,7 +47,7 @@ shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
 
 [beta:vars]
 ansible_ssh_private_key_file=~/.ssh/oregon.pem
-datadog_host=10.20.1.59
+datadog_host_address=10.20.1.59
 datadog_tags=env:beta
 domain=runnable-beta.com
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead

ansible/gamma-hosts/variables

@@ -47,7 +47,7 @@ shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
 
 [gamma:vars]
 ansible_ssh_private_key_file=~/.ssh/gamma.pem
-datadog_host=10.4.6.251
+datadog_host_address=10.4.6.251
 datadog_tags=env:gamma
 domain=runnable-gamma.com
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead

ansible/group_vars/all.yml

@@ -3,7 +3,7 @@
 registry_env: "prod"
 
 # for docker stop old container
-stop_time: 60
+stop_time: 5
 
 # For docker built containers
 do_not_push: true
@@ -27,8 +27,6 @@ loggly_token: f673760d-e0b3-4a93-a15e-2862ea074f91
 loggly_password: TebejAcutHeH_Ch0tR9ru4anaT6CRu*3
 loggly_username: ops
 
-weave_path: "/usr/local/bin/weave"
-
 ##
 ## shared application configs
 ##
@@ -37,28 +35,71 @@ weave_path: "/usr/local/bin/weave"
 api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
 api_neo4j_port: 7474
 api_neo4j_protocol: http://
+api_hostname: api.{{ domain }}
+api_port: 80
+
+# astral
+pg_database: astral
+
+# charon
+charon_port: 53
 
 # datadog
-datadog_port: 8125
 datadog_api_key: 6488896fe0c811965ef233b96809d70d
+datadog_host_address: "{{ ansible_default_ipv4.address }}"
+datadog_port: 8125
+
+# detention
+detention_host_address: "{{ hostvars[groups['detention'][0]]['ansible_default_ipv4']['address'] }}"
+detention_port: 9123
+detention_hostname: "detention.{{ domain }}"
 
 # docker
-docker_port: 4242
+docker_ca_path: /etc/ssl/docker/ca.pem
 docker_cert_path: /etc/ssl/docker/cert.pem
 docker_key_path: /etc/ssl/docker/key.pem
-docker_ca_path: /etc/ssl/docker/ca.pem
+docker_port: 4242
 
 # eru
-eru_api_host: api.{{ domain }}
+eru_port: 57831
+eru_hostname: "admin.{{ domain }}"
+
+# mavis
+mavis_hostname: "mavis.{{ domain }}"
+mavis_port: 3000
+
+# metis
+metis_port: 3000
+
+# mongo
+mongo_hosts: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_default_ipv4']['address'] }}:27000{% if not loop.last %},{% endif %}{% endfor %}"
+
+# navi
+navi_host_address: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
+navi_port: 3567
+
+# neo4j
+neo4j_host_address: "{{ hostvars[groups['neo4j'][0]]['ansible_default_ipv4']['address'] }}"
+
+# optimus
+optimus_port: 80
+optimus_hostname: optimus.{{ domain }}
 
 # rabbit
+rabbit_host_address: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
 rabbit_port: 54321
 
-# astral
-pg_database: astral
+# redis
+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
 
 # swarm
 swarm_master_port: 2375
+

ansible/group_vars/alpha-api.yml

@@ -6,59 +6,53 @@ rollbar_token: a90d9c262c7c48cfabbd32fd0a1bc61c
 container_image: registry.runnable.com/runnable/{{ name }}
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
-hosted_ports: ["80"]
+hosted_ports: ["{{ api_port }}"]
 node_version: "0.10.38"
 npm_version: "2.8.3"
 
 # for redis
-redis_key: "frontend:api.{{ domain }}"
+redis_key: "frontend:{{ api_hostname }}"
 is_redis_update_required: 'yes'
-datadog_host: "{{ ansible_default_ipv4.address }}"
-
-mongo_hosts: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_default_ipv4']['address'] }}:27000{% if not loop.last %},{% endif %}{% endfor %}"
-neo4j_host: "{{ hostvars[groups['neo4j'][0]]['ansible_default_ipv4']['address'] }}"
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
 
 # for container settings
 container_envs: >
-  -h api
   -e AWS_ACCESS_KEY_ID={{ api_aws_access_key_id }}
   -e AWS_SECRET_ACCESS_KEY={{ api_aws_secret_access_key }}
-  -e DATADOG_HOST={{ datadog_host }}
+  -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
-  -e GITHUB_CALLBACK_URL=https://api.{{ domain }}/auth/github/callback
+  -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
-  -e GITHUB_HOOK_URL=https://api.{{ domain }}/actions/github
+  -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
-  -e MAVIS_HOST=http://mavis.{{ domain }}:80
+  -e MAVIS_HOST=http://{{ mavis_hostname }}:80
   -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.{{ domain }}
-  -e NAVI_HOST=http://{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}:3567
-  -e NEO4J={{ api_neo4j_protocol }}{{ api_neo4j_auth }}@{{ neo4j_host }}:{{ api_neo4j_port }}
+  -e NAVI_HOST=http://{{ navi_host_addressname }}:{{ 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 }}
   -e NEW_RELIC_LOG_LEVEL=fatal
   -e NEW_RELIC_NO_CONFIG_FILE=true
   -e NODE_ENV={{ node_env }}
   -e NUM_WORKERS=1
-  -e OPTIMUS_HOST=http://optimus.{{ domain }}
-  -e RABBITMQ_HOSTNAME={{ rabbit_host | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}
+  -e OPTIMUS_HOST=http://{{ optimus_hostname }}
+  -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
   -e RABBITMQ_PORT={{ rabbit_port }}
   -e RABBITMQ_USERNAME={{ rabbit_username }}
-  -e REDIS_IPADDRESS={{ redis_host }}
-  -e REDIS_PORT=6379
+  -e REDIS_IPADDRESS={{ redis_host_address }}
+  -e REDIS_PORT={{ redis_port }}
   -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 }}
 
 container_run_opts: >
+  -h {{ name }}
   -d
   -P
   -v /opt/ssl/docker/{{ name }}:/etc/ssl/docker:ro

ansible/group_vars/alpha-charon.yml

@@ -1,17 +1,14 @@
 name: "charon"
-app_name: "charon"
+app_name: "{{ name }}"
 app_repo: "git@github.com:CodeNow/{{ name }}.git"
-hosted_ports: ["53"]
-
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
-redis_port: 6379
+hosted_ports: ["{{ charon_port }}"]
 
 enviroment_vars:
-  API_HOST: "api.{{ domain }}"
+  API_HOST: "{{ api_hostname }}"
   API_TOKEN: "51c61b779f3de616a9639cfc44a22c79fbd8e328"
-  DATADOG_HOST: "{{ datadog_host }}"
+  DATADOG_HOST: "{{ datadog_host_address }}"
   DATADOG_PORT: "{{ datadog_port }}"
   DOMAIN_FILTER: "{{ user_content_domain }}"
   PORT: "{{ hosted_ports[0] }}"
-  REDIS_HOST: "{{ redis_host }}"
+  REDIS_HOST: "{{ redis_host_address }}"
   REDIS_PORT: "{{ redis_port }}"

ansible/group_vars/alpha-detention.yml

@@ -3,23 +3,25 @@ name: "detention"
 container_image: "registry.runnable.com/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
-hosted_ports: ["9123"]
+hosted_ports: ["{{ detention_port }}"]
 node_version: "0.12.0"
 npm_version: "2.1.18"
 
 # for redis
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
-redis_key: "frontend:{{ name }}.{{ domain }}"
+redis_key: "frontend:{{ detention_hostname }}"
 is_redis_update_required: 'yes'
 
 dockerfile_post_install_commands: [
   "npm run grunt"
 ]
 
 container_envs: >
-  -h {{ name }}
   -e NODE_ENV={{ node_env }}
-  -e ABSOLUTE_URL=detention.{{ domain }}
+  -e ABSOLUTE_URL={{ detention_hostname }}
   -e PORT={{ hosted_ports[0] }}
 
-container_run_opts: "-d -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }} {{container_envs}}"
+container_run_opts: >
+  -h {{ name }}
+  -d
+  -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }}
+  {{ container_envs }}

ansible/group_vars/alpha-docker-listener.yml

@@ -4,16 +4,11 @@ name: docker-listener
 app_name: "docker-listener"
 app_repo: "git@github.com:CodeNow/docker-listener.git"
 
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
-redis_port: 6379
-
 enviroment_vars:
-  DOCKER_CERT_PATH: "/opt/ssl/docker/{{ name }}"
-  HOST_TAGS: "{{ host_tags | default('default')  }}"
   LOGGLY_TOKEN: "{{ loggly_token }}"
-  RABBITMQ_HOSTNAME: "{% if rabbit_host is defined %}{{ rabbit_host }}{% else %}{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}{% endif %}"
+  RABBITMQ_HOSTNAME: "{{ rabbit_host_address }}"
   RABBITMQ_PASSWORD: "{{ rabbit_password }}"
   RABBITMQ_PORT: "{{ rabbit_port }}"
   RABBITMQ_USERNAME: "{{ rabbit_username }}"
-  REDIS_IPADDRESS: "{{ redis_host }}"
+  REDIS_IPADDRESS: "{{ redis_host_address }}"
   REDIS_PORT: "{{ redis_port }}"

ansible/group_vars/alpha-eru.yml

@@ -3,23 +3,24 @@ name: eru
 container_image: registry.runnable.com/runnable/{{ name }}
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
-hosted_ports: [57831]
+hosted_ports: [{{ eru_port }}]
 node_version: "0.12.0"
 npm_version: "2.1.18"
-stop_time: 5
 
 # for redis
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
-redis_key: frontend:admin.{{ domain }}
+redis_key: frontend:{{ eru_hostname }}
 is_redis_update_required: yes
 
 container_envs: >
-  -h {{ name }}
-  -e ADMIN_DOMAIN=admin.{{ domain }}
+  -e ADMIN_DOMAIN={{ eru_hostname }}
   -e ADMIN_GITHUB_ID={{ eru_github_id }}
   -e ADMIN_GITHUB_SECRET={{ eru_github_secret }}
-  -e API_HOST={{ eru_api_host }}
+  -e API_HOST={{ api_hostname }}
   -e RUNNABLE_HOST={{ domain }}
   -e PORT={{ hosted_ports[0] }}
 
-container_run_opts: -d -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }} {{ container_envs }}
+container_run_opts: >
+  -h {{ name }}
+  -d
+  -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }}
+  {{ container_envs }}

ansible/group_vars/alpha-filibuster.yml

@@ -6,3 +6,5 @@ name: filibuster
 app_name: "filibuster"
 app_repo: "git@github.com:Runnable/Filibuster.git"
 node_env: "{{ filibuster_env }}"
+
+enviroment_vars: {}

ansible/group_vars/alpha-hipache.yml

@@ -1,19 +1,19 @@
 # container_kill_start settings
 name: hipache
-redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
-redis_port: 6379
 
 container_image: registry.runnable.com/runnable/hipache
 container_tag: latest
+hosted_ports: [ 80, 443 ]
+
 container_run_opts: >
   -d
   -p 80:80
   -p 443:443
   -v /opt/hipache-conf:/host:rw
   -v /etc/ssl/certs/{{ domain }}:/etc/ssl/certs/{{ domain }}
   -v /etc/ssl/private/{{ domain }}.key:/etc/ssl/private/{{ domain }}.key
+
 container_run_args: /usr/local/bin/hipache --config /host/config.json
-hosted_ports: [ 80, 443 ]
 
 # hipache settings
 retry_on_error: 0