Fix ENV stuff. Fix storage gb vars

Author: thejsj

ansible/group_vars/all.yml

@@ -104,6 +104,7 @@ clio_mongo_database: clio
 # consul
 consul_api_port: 8500
 consul_https_port: 8501
+consul_storage_size_gb: 10
 
 # cream
 cream_port: 8899
@@ -173,6 +174,9 @@ marketing_url: https://{{ domain }}
 # metabase
 metabase_port: 3000
 
+# mongo
+mongo_storage_size_gb: 50
+
 # navi
 navi_host_address: navi
 navi_http_port: 3567
@@ -193,8 +197,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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
 
@@ -205,10 +213,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

ansible/group_vars/alpha-consul.yml

@@ -26,7 +26,7 @@ container_run_opts: >
   -p {{ ansible_default_ipv4.address }}:{{ consul_https_port }}:{{ consul_https_port }}
   --restart=always
 
-storage_size_gb: 10
+storage_size_gb: "{{ consul_storage_size_gb }}"
 
 container_run_args: >
   consul agent

ansible/group_vars/alpha-ingress-proxy.yml

@@ -43,17 +43,18 @@ services:
       - name: base
         route: "/"
         port: "{{ api_port }}"
-  # TODO: Find a way to NOT have to deploy these
-  # - name: eru
-    # upstreams:
-      # - name: base
-        # route: "/"
-        # port: "{{ eru_http_port }}"
-      # - name: graphql
-        # route: "/graphql"
-        # port: "{{ eru_graphql_port }}"
-  # - name: egret
-    # upstreams:
-      # - name: base
-        # route: "/"
-        # port: "{{ egret_port }}"
+  - name: eru
+    include: "{{ include_eru_proxy | default(true) }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ eru_http_port }}"
+      - name: graphql
+        route: "/graphql"
+        port: "{{ eru_graphql_port }}"
+  - name: egret
+    include: "{{ include_ergre_proxy | default(true) }}"
+    upstreams:
+      - name: base
+        route: "/"
+        port: "{{ egret_port }}"

ansible/group_vars/alpha-mongo.yml

@@ -2,7 +2,7 @@ name: mongo
 hosted_ports: ["{{ mongo_port }}"]
 container_run_args: ''
 
-storage_size_gb: 50
+storage_size_gb: "{{ mongo_storage_size_gb }}"
 
 volume_id: "{{ mongo_volume_id }}"
 

ansible/group_vars/alpha-postgres.yml

@@ -2,7 +2,7 @@ name: postgres
 hosted_ports: ["{{ pg_port }}"]
 container_run_args: ''
 
-storage_size_gb: 50
+storage_size_gb: "{{ postgres_storage_size_gb }}"
 
 volume_mounts:
   - name: "{{ name }}-db-claim"

ansible/group_vars/alpha-prometheus.yml

@@ -6,7 +6,7 @@ hosted_ports: ["{{ prometheus_port }}"]
 
 memory_hard_limit: 15G
 
-storage_size_gb: 100
+storage_size_gb: "{{ prometheus_storage_size_gb }}"
 
 volume_id: "{{ prometheus_volume_id }}"
 

ansible/group_vars/alpha-rabbitmq.yml

@@ -3,7 +3,7 @@ service_name: rabbitmq
 
 hosted_ports: [ "{{ rabbit_port }}", 15672 ]
 
-storage_size_gb: 50
+storage_size_gb: "{{ rabbit_storage_size_gb }}"
 
 volume_id: "{{ rabbit_volume_id }}"
 

ansible/group_vars/alpha-redis.yml

@@ -1,7 +1,7 @@
 name: redis
 hosted_ports: ["{{ redis_port }}"]
 
-storage_size_gb: 50
+storage_size_gb: "{{ redis_storage_size_gb }}"
 
 volume_id: "{{ redis_volume_id }}"
 

ansible/roles/runnable-domain-proxy/templates/sites-enabled.tmpl

@@ -57,6 +57,7 @@ data:
     }
 
 {% for service in services %}
+{% if 'include' not in service or service.include != false %}
   {{ service.name }}.conf: |
     map $http_upgrade $connection_upgrade {
       default upgrade;
@@ -134,4 +135,5 @@ data:
 
 {% endfor %}
     }
+{% endif %}
 {% endfor %}