From 3fb61912aaadc76e7389d03b6cbed15c40a637f9 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 29 Jan 2015 10:38:21 -0500 Subject: [PATCH] Quote args in /srv/salt-overlay/pillar, add new vars --- .../templates/create-dynamic-salt-files.sh | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/cluster/aws/templates/create-dynamic-salt-files.sh b/cluster/aws/templates/create-dynamic-salt-files.sh index d36b2daf422..5440da94331 100644 --- a/cluster/aws/templates/create-dynamic-salt-files.sh +++ b/cluster/aws/templates/create-dynamic-salt-files.sh @@ -20,14 +20,18 @@ mkdir -p /srv/salt-overlay/pillar cat </srv/salt-overlay/pillar/cluster-params.sls -node_instance_prefix: $NODE_INSTANCE_PREFIX -portal_net: $PORTAL_NET -enable_node_monitoring: $ENABLE_NODE_MONITORING -enable_node_logging: $ENABLE_NODE_LOGGING -logging_destination: $LOGGING_DESTINATION -enable_cluster_dns: $ENABLE_CLUSTER_DNS -dns_server: $DNS_SERVER_IP -dns_domain: $DNS_DOMAIN +node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")' +portal_net: '$(echo "$PORTAL_NET" | sed -e "s/'/''/g")' +enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")' +enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")' +enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' +enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' +logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' +elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")' +enable_cluster_dns: '$(echo "$ENABLE_CLUSTER_DNS" | sed -e "s/'/''/g")' +dns_replicas: '$(echo "$DNS_REPLICAS" | sed -e "s/'/''/g")' +dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")' +dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")' EOF mkdir -p /srv/salt-overlay/salt/nginx