commit e3d66d6717fc6107110d38fdd720253ff4ca0935
author Michal Kobus <mkobus@mirantis.com> Thu Apr 02 18:50:52 2020 +0200
committer mkobus <mkobus@mirantis.com> Mon Apr 06 10:13:20 2020 +0000
tree 497ae933003c082b9482c9820bba85ea8276b75f
parent 40f80277a167af04ec146f87ab41e8cb18d03417

Fix env vars for sf-notifer and gainsight

- paste env var as is
- fixes quoting issues with passwords
- single-quoting all string vars

Change-Id: Id9ce82718ea27c02a7cc415e0cda174ad5077ebf
Related-bug: PROD-35072

docker/swarm/stack/monitoring/sf_notifier.yml

diff --git a/docker/swarm/stack/monitoring/sf_notifier.yml b/docker/swarm/stack/monitoring/sf_notifier.yml
index b8b2dd6..a77b457 100644
--- a/docker/swarm/stack/monitoring/sf_notifier.yml
+++ b/docker/swarm/stack/monitoring/sf_notifier.yml
@@ -30,13 +30,13 @@
               ports:
                 - 15018:5000
               environment:
-                SF_NOTIFIER_WORKERS: ${_param:sf_notifier_workers}
-                SF_NOTIFIER_BUFFER_SIZE: ${_param:sf_notifier_buffer_size}
-                SF_NOTIFIER_APP_PORT: ${prometheus:sf_notifier:uwsgi:bind_port}
-                SF_NOTIFIER_ALERT_ID_HASH_FUNC: ${_param:sf_notifier_alert_id_hash_func}
-                SFDC_AUTH_URL: "${_param:sf_notifier_sfdc_auth_url}"
-                SFDC_USERNAME: "${_param:sf_notifier_sfdc_username}"
-                SFDC_PASSWORD: "${_param:sf_notifier_sfdc_password}"
-                SFDC_ORGANIZATION_ID: "${_param:sf_notifier_sfdc_organization_id}"
-                SFDC_ENVIRONMENT_ID: "${_param:sf_notifier_sfdc_environment_id}"
-                SFDC_SANDBOX_ENABLED: "${_param:sf_notifier_sfdc_sandbox_enabled}"
+                - SF_NOTIFIER_WORKERS=${_param:sf_notifier_workers}
+                - SF_NOTIFIER_BUFFER_SIZE=${_param:sf_notifier_buffer_size}
+                - SF_NOTIFIER_APP_PORT=${prometheus:sf_notifier:uwsgi:bind_port}
+                - SF_NOTIFIER_ALERT_ID_HASH_FUNC='${_param:sf_notifier_alert_id_hash_func}'
+                - SFDC_AUTH_URL='${_param:sf_notifier_sfdc_auth_url}'
+                - SFDC_USERNAME='${_param:sf_notifier_sfdc_username}'
+                - SFDC_PASSWORD='${_param:sf_notifier_sfdc_password}'
+                - SFDC_ORGANIZATION_ID='${_param:sf_notifier_sfdc_organization_id}'
+                - SFDC_ENVIRONMENT_ID='${_param:sf_notifier_sfdc_environment_id}'
+                - SFDC_SANDBOX_ENABLED='${_param:sf_notifier_sfdc_sandbox_enabled}'