Merge pull request #698 from CodeNow/revert-697-revert-685-add-new-self-hosted-environment

Revert "Revert "Add new self hosted environment Part 1""

Author: thejsj

.gitignore

@@ -14,7 +14,7 @@ environments/*/secrets/**/*
 # Leaving for now while PR is merged
 environments/*/k8
 # Meant to not break anything. Might remove later
-environments/self-hosted-test
+environments/runnable-on-prem-test
 *.retry
 *.tfstate*
 terraform/credentials.tfvars

ansible/consul-values-job.yml

@@ -0,0 +1,7 @@
+---
+- hosts: consul
+  vars_files:
+    - "group_vars/alpha-consul.yml"
+    - "group_vars/alpha-consul-values.yml"
+  roles:
+    - role: k8-job

ansible/consul-values.yml

@@ -5,14 +5,16 @@
   tasks:
     - name: make sure httplib2 is installed
       become: true
-      apt: package=python-httplib2 state=present
+      pip:
+        name: httplib2
+        executable: pip
 
     - 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 }}
+        url={{ consul_url }}/v1/kv/{{ item.key }}
         body="{{ item.value }}"
       with_items: "{{ consul_seed }}"
 
@@ -22,7 +24,7 @@
       when: read_values is defined
       uri:
         method=GET
-        url=http://{{ ansible_default_ipv4.address }}:8500/v1/kv/{{ item.key }}
+        url={{ consul_url }}/v1/kv/{{ item.key }}
       with_items: "{{ consul_seed }}"
       register: values
 

ansible/enterprise-sign-in.yml

@@ -4,5 +4,4 @@
     - group_vars/alpha-enterprise-sign-in.yml
   roles:
   - { role: builder, tags: "build" }
-  - { role: container_start }
-  - { role: wait_for_container_exit }
+  - { role: k8-job }

ansible/group_vars/all.yml

@@ -14,6 +14,7 @@ docker_client_root: "{{ secrets_root }}/docker-client/"
 config_maps_path: "{{ opts_root }}/configMaps"
 services_path: "{{ opts_root }}/services"
 deployments_path: "{{ opts_root }}/deployments"
+jobs_path: "{{ opts_root }}/jobs"
 cron_jobs_path: "{{ opts_root }}/crons"
 volumes_path: "{{ opts_root }}/volumes"
 daemon_sets_path: "{{ opts_root }}/daemonSets"
@@ -75,6 +76,8 @@ api_port: 80
 api_socket_server_hostname: apisock.{{ domain }}
 api_socket_server_rollbar_key: cad27f265e8e473c9b293615e7ed0f3a
 api_url: https://{{ api_hostname }}
+api_mongo_user: api
+api_mongo_auth: "{{ api_mongo_user }}:{{ api_mongo_password }}"
 sendgrid_key: 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
 
 # arithmancy
@@ -99,10 +102,13 @@ charon_port: 53
 clio_host_address: clio
 clio_port: 8008
 clio_mongo_database: clio
+clio_mongo_user: clio
+clio_mongo_auth: "{{ clio_mongo_user }}:{{ clio_mongo_password }}"
 
 # consul
 consul_api_port: 8500
 consul_https_port: 8501
+consul_storage_size_gb: 10
 
 # cream
 cream_port: 8899
@@ -172,9 +178,13 @@ marketing_url: https://{{ domain }}
 # metabase
 metabase_port: 3000
 
+# mongo
+mongo_storage_size_gb: 50
+
 # navi
 navi_host_address: navi
 navi_http_port: 3567
+navi_mongo_hosts: "mongo"
 navi_rollbar_token: 719269e87b9b42848472542a8b2059ae
 
 # node_exporter
@@ -192,8 +202,12 @@ palantiri_rollbar_token: ed971bbca9ea44a29268afc606ab8c7d
 pheidi_email_github_token: 115b4d854e34e8a5ba99ab73eefe4bf7a8944d6d
 pheidi_rollbar_token: 6fc422ac645441bea7f6f14853eb01ab
 
+# postgres
+postgres_storage_size_gb: 50
+
 # prometheus
 prometheus_port: 9090
+prometheus_storage_size_gb: 100
 prometheus_aws_access_key: AKIAIFG37NSI6O2QMRRQ
 prometheus_aws_secret_key: 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
 
@@ -204,10 +218,12 @@ prometheus_alert_url: http://prometheus-alerts:{{ prometheus_alert_port }}
 # rabbit
 rabbit_host_address: rabbitmq
 rabbit_port: 5672
+rabbit_storage_size_gb: 50
 
 # redis
 redis_host_address: redis
 redis_port: 6379
+redis_storage_size_gb: 50
 
 # sauron
 sauron_rollbar_token: 83157ae2d50d4b6398e404c0b9978d26
@@ -228,6 +244,9 @@ swarm_container_name: swarm
 # navi/link
 link_hello_runnable_token: 5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29
 navi_mongo_database: navi
+navi_mongo_user: "navi"
+navi_mongo_auth: "{{ navi_mongo_user }}:{{ navi_mongo_password }}"
+navi_mongo_hosts: "{{ mongo_hosts }}"
 
 npm_token: c0c4b32a-3de5-4e27-9d32-56c1616746d8
 
@@ -241,6 +260,7 @@ user_vault_host_address: user-vault
 # local-vault
 vault_local_port: 31836
 vault_addr: http://127.0.0.1:{{ vault_local_port }}
+vault_consul_address: "consul.{{ domain }}"
 
 # userland
 userland_host_address: userland

ansible/group_vars/alpha-api-base.yml

@@ -73,7 +73,7 @@ api_base_container_envs:
   - name: KRAIN_PORT
     value: "{{ krain_port }}"
   - name: MIXPANEL_APP_ID
-    value: "{{ api_mixpanel_app_id }}"
+    value: "{{ api_mixpanel_app_id | default('ansible_undefined') }}"
   - name: MONGO_AUTH
     value: "{{ api_mongo_auth }}"
   - name: MONGO_DB

ansible/group_vars/alpha-api.yml

@@ -8,7 +8,7 @@ num_replicas: 16
 
 envs:
   - name: ROLLBAR_KEY
-    value: "{{ api_rollbar_key }}"
+    value: "{{ api_rollbar_key | default('ansible_undefined') }}"
 
 volume_mounts:
   - name: "{{ name }}-docker-ssl-certs"

ansible/group_vars/alpha-arithmancy.yml

@@ -23,4 +23,4 @@ container_envs:
   - name: RABBITMQ_USERNAME
     value: "{{ rabbit_username }}"
   - name: ROLLBAR_KEY
-    value: "{{ arithmancy_rollbar_key }}"
+    value: "{{ arithmancy_rollbar_key | default('ansible_undefined') }}"

ansible/group_vars/alpha-big-poppa-base.yml

@@ -58,6 +58,6 @@ big_poppa_base_container_envs:
   - name: GITHUB_PROTOCOL
     value: "http"
   - name: STRIPE_API_KEY
-    value: "{{ cream_stripe_secret_key }}"
+    value: "{{ cream_stripe_secret_key | default('ansible_undefined') }}"
   - name: STRIPE_PUBLISHABLE_KEY
-    value: "{{ cream_stripe_publishable_key }}"
+    value: "{{ cream_stripe_publishable_key | default('ansible_undefined') }}"

ansible/group_vars/alpha-big-poppa-http.yml

@@ -8,7 +8,7 @@ envs:
   - name: PORT
     value: "{{ big_poppa_port }}"
   - name: ROLLBAR_KEY
-    value: "{{ big_poppa_http_rollbar_token }}"
+    value: "{{ big_poppa_http_rollbar_token | default('ansible_undefined') }}"
   - name: NEW_RELIC_APP_NAME
     value: "{{ big_poppa_new_relic_app_name | default('ansible_undefined') }}"
   - name: NEW_RELIC_LICENSE_KEY