Merge pull request #474 from CodeNow/SAN-4260-update-userland

make userland its own thing, add userland to navi

Author: anandkumarpatel

ansible/delta-hosts/hosts

@@ -3,7 +3,9 @@ delta-bastion
 
 [hipache]
 delta-hipache httpsCheckForBackend80=false prependIncomingPort=true subDomainDepth=4
-delta-userland domain=runnableapp.com httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
+
+[userland]
+delta-userland
 
 [mongodb]
 delta-mongo-a
@@ -138,6 +140,7 @@ shiva
 socket-server
 socket-server-proxy
 swarm-manager
+userland
 web
 worker
 

ansible/epsilon-hosts/hosts

@@ -3,7 +3,9 @@ epsilon-bastion
 
 [hipache]
 epsilon-hipache httpsCheckForBackend80=false prependIncomingPort=true subDomainDepth=4
-epsilon-userland domain=runnablecloud.com httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
+
+[userland]
+epsilon-userland
 
 [mongodb]
 epsilon-mongo
@@ -132,6 +134,7 @@ shiva
 socket-server
 socket-server-proxy
 swarm-manager
+userland
 web
 worker
 

ansible/gamma-hosts/hosts

@@ -3,7 +3,9 @@ gamma-bastion
 
 [hipache]
 gamma-hipache httpsCheckForBackend80=false prependIncomingPort=true subDomainDepth=4
-gamma-userland domain=runnable.ninja httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
+
+[userland]
+gamma-userland
 
 [mongodb]
 gamma-mongo-a
@@ -138,6 +140,7 @@ shiva
 socket-server
 socket-server-proxy
 swarm-manager
+userland
 web
 worker
 

ansible/group_vars/all.yml

@@ -174,3 +174,6 @@ navi_mongo_port: 27017
 # local-vault
 vault_local_port: 31836
 vault_addr: http://127.0.0.1:{{ vault_local_port }}
+
+# userland
+userland_host_address: "{{ hostvars[groups['userland'][0]]['ansible_default_ipv4']['address'] }}"

ansible/group_vars/alpha-navi.yml

@@ -32,6 +32,7 @@ container_envs: >
   -e REDIS_CACERT={{ redis_ca_cert_path }}
   -e REDIS_IPADDRESS={{ redis_host_address }}
   -e REDIS_PORT={{ redis_tls_port }}
+  -e USERLAND_IP={{ userland_host_address }}
   {% if navi_intercom_api_key is defined %} -e INTERCOM_API_KEY={{ navi_intercom_api_key }} {% endif %}
   {% if navi_intercom_app_id is defined %} -e INTERCOM_APP_ID={{ navi_intercom_app_id }} {% endif %}
   {% if navi_new_relic_app_name is defined %} -e NEW_RELIC_APP_NAME={{ navi_new_relic_app_name }} {% endif %}

ansible/navi.yml

@@ -4,6 +4,7 @@
 - hosts: mongo-navi
 - hosts: rabbitmq
 - hosts: consul
+- hosts: userland
 
 - hosts: navi
   vars_files:

ansible/stage-hosts/hosts

@@ -2,15 +2,9 @@
 
 [docks]
 
-[hipache]
-alpha-stage-userland-hipache domain=runnable2.net httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
-
 [targets]
 localhost ansible_connection=local bastion_name=alpha-bastion
 
-[rabbitmq]
-delta-staging-data
-
 [redis]
 delta-staging-data
 
@@ -23,7 +17,6 @@ delta-staging-data
 [stage:children]
 dock
 docks
-hipache
 rabbitmq
 redis
 vault