Change sf-notifier and sf-reporter env vars structure to dict
Introduced in Id9ce82718ea27c02a7cc415e0cda174ad5077ebf
change from dict to list + additonal quoting.
1. quoting removal fixes PROD-35330
2. changing list back to dict fixes PROD-35339
Change-Id: I9fd2882207faae59fbc085e2124344611a770b36
Related-bug: PROD-35330
Related-bug: PROD-35339
diff --git a/docker/swarm/stack/monitoring/gainsight.yml b/docker/swarm/stack/monitoring/gainsight.yml
index 472b047..a2935da 100644
--- a/docker/swarm/stack/monitoring/gainsight.yml
+++ b/docker/swarm/stack/monitoring/gainsight.yml
@@ -39,12 +39,12 @@
- ${prometheus:gainsight:dir:config}:${_param:gainsight_config_directory}
- ${prometheus:gainsight:dir:crontab}:${_param:gainsight_crontab_directory}
environment:
- - CLUSTER_ID='${_param:gainsight_cluster_id}'
- - PROMETHEUS_URL='${_param:gainsight_prometheus_url}'
- - CONFIG_PATH='${_param:gainsight_config_path}'
- - SFDC_AUTH_URL='${_param:gainsight_sfdc_auth_url}'
- - SFDC_USERNAME='${_param:gainsight_sfdc_username}'
- - SFDC_PASSWORD='${_param:gainsight_sfdc_password}'
- - SFDC_ORGANIZATION_ID='${_param:gainsight_sfdc_organization_id}'
- - SFDC_ENVIRONMENT_ID='${_param:gainsight_sfdc_environment_id}'
- - SFDC_SANDBOX_ENABLED='${_param:gainsight_sfdc_sandbox_enabled}'
+ CLUSTER_ID: ${_param:gainsight_cluster_id}
+ PROMETHEUS_URL: ${_param:gainsight_prometheus_url}
+ CONFIG_PATH: ${_param:gainsight_config_path}
+ SFDC_AUTH_URL: ${_param:gainsight_sfdc_auth_url}
+ SFDC_USERNAME: ${_param:gainsight_sfdc_username}
+ SFDC_PASSWORD: ${_param:gainsight_sfdc_password}
+ SFDC_ORGANIZATION_ID: ${_param:gainsight_sfdc_organization_id}
+ SFDC_ENVIRONMENT_ID: ${_param:gainsight_sfdc_environment_id}
+ SFDC_SANDBOX_ENABLED: ${_param:gainsight_sfdc_sandbox_enabled}
diff --git a/docker/swarm/stack/monitoring/sf_notifier.yml b/docker/swarm/stack/monitoring/sf_notifier.yml
index a77b457..ff32a0b 100644
--- a/docker/swarm/stack/monitoring/sf_notifier.yml
+++ b/docker/swarm/stack/monitoring/sf_notifier.yml
@@ -33,10 +33,10 @@
- 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_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}