Replace manifest user-provided services with environment variables

Variable values are populated from the credentials by the `generate-manifest`
make target.
This commit is contained in:
Alexey Bezhan
2018-01-09 14:17:03 +00:00
parent ab55bf49b2
commit c550c686d1
4 changed files with 40 additions and 22 deletions

View File

@@ -2,16 +2,30 @@
buildpack: python_buildpack
command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 5 -b 0.0.0.0:$PORT application
services:
- notify-aws
- notify-config
- notify-template-preview
- hosted-graphite
- deskpro
instances: 1
memory: 1G
env:
NOTIFY_APP_NAME: admin
# Credentials variables
ADMIN_CLIENT_SECRET: null
ADMIN_BASE_URL: null
API_HOST_NAME: null
DANGEROUS_SALT: null
SECRET_KEY: null
ROUTE_SECRET_KEY_1: null
ROUTE_SECRET_KEY_2: null
AWS_ACCESS_KEY_ID: null
AWS_SECRET_ACCESS_KEY: null
STATSD_PREFIX: null
DESKPRO_API_HOST: null
DESKPRO_API_KEY: null
TEMPLATE_PREVIEW_API_HOST: null
TEMPLATE_PREVIEW_API_KEY: null
applications:
- name: notify-admin

View File

@@ -3,11 +3,6 @@
inherit: manifest-base.yml
services:
- notify-aws
- notify-config
- notify-template-preview
- hosted-graphite
- deskpro
- logit-ssl-syslog-drain
routes:

View File

@@ -2,16 +2,30 @@
buildpack: python_buildpack
command: scripts/run_app_paas.sh gunicorn -w 5 -b 0.0.0.0:$PORT application
services:
- notify-aws
- notify-config
- notify-template-preview
- hosted-graphite
- deskpro
instances: 1
memory: 1G
env:
NOTIFY_APP_NAME: admin
# Credentials variables
ADMIN_CLIENT_SECRET: null
ADMIN_BASE_URL: null
API_HOST_NAME: null
DANGEROUS_SALT: null
SECRET_KEY: null
ROUTE_SECRET_KEY_1: null
ROUTE_SECRET_KEY_2: null
AWS_ACCESS_KEY_ID: null
AWS_SECRET_ACCESS_KEY: null
STATSD_PREFIX: null
DESKPRO_API_HOST: null
DESKPRO_API_KEY: null
TEMPLATE_PREVIEW_API_HOST: null
TEMPLATE_PREVIEW_API_KEY: null
applications:
- name: notify-admin-prototype

View File

@@ -7,11 +7,6 @@ routes:
- route: www.staging-notify.works
services:
- notify-aws
- notify-config
- notify-template-preview
- hosted-graphite
- deskpro
- logit-ssl-syslog-drain
instances: 2