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

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/runnable-on-prem-test
+environments/self-hosted-test
 *.retry
 *.tfstate*
 terraform/credentials.tfvars

ansible/consul-values-job.yml

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

ansible/consul-values.yml

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

ansible/enterprise-sign-in.yml

@@ -14,7 +14,6 @@ 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"
@@ -104,7 +103,6 @@ clio_mongo_database: clio
 # consul
 consul_api_port: 8500
 consul_https_port: 8501
-consul_storage_size_gb: 10
 
 # cream
 cream_port: 8899
@@ -174,9 +172,6 @@ marketing_url: https://{{ domain }}
 # metabase
 metabase_port: 3000
 
-# mongo
-mongo_storage_size_gb: 50
-
 # navi
 navi_host_address: navi
 navi_http_port: 3567
@@ -197,12 +192,8 @@ 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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
 
@@ -213,12 +204,10 @@ 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
@@ -252,7 +241,6 @@ 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/all.yml

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

ansible/group_vars/alpha-api-base.yml

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

ansible/group_vars/alpha-api.yml

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

ansible/group_vars/alpha-arithmancy.yml

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

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

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