From d4f71b7d4a60f5795168ffc349e3e5ec2724f6ee Mon Sep 17 00:00:00 2001 From: Steve Reed Date: Thu, 11 Dec 2014 12:18:45 -0800 Subject: [PATCH 1/2] Fixes malformed OBJECT_URL in rackspace setup script --- cluster/rackspace/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index 57519a8a842..54731e74b0a 100644 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -151,7 +151,7 @@ rax-boot-master() { # Copy cloud-config to KUBE_TEMP and work some sed magic sed -e "s|DISCOVERY_ID|${DISCOVERY_ID}|" \ - -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\&}|" \ + -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\\&}|" \ -e "s|KUBE_USER|${KUBE_USER}|" \ -e "s|KUBE_PASSWORD|${KUBE_PASSWORD}|" \ -e "s|PORTAL_NET|${PORTAL_NET}|" \ From 4c312caeb050aee6298091acaa325a2b4979fd9b Mon Sep 17 00:00:00 2001 From: Steve Reed Date: Thu, 11 Dec 2014 13:01:05 -0800 Subject: [PATCH 2/2] Fixes the minion yaml as well --- cluster/rackspace/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index 54731e74b0a..e7b1180b6b1 100644 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -183,7 +183,7 @@ rax-boot-minions() { sed -e "s|DISCOVERY_ID|${DISCOVERY_ID}|" \ -e "s|INDEX|$((i + 1))|g" \ - -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\&}|" \ + -e "s|CLOUD_FILES_URL|${RELEASE_TMP_URL//&/\\&}|" \ -e "s|ENABLE_NODE_MONITORING|${ENABLE_NODE_MONITORING:-false}|" \ -e "s|ENABLE_NODE_LOGGING|${ENABLE_NODE_LOGGING:-false}|" \ -e "s|LOGGING_DESTINATION|${LOGGING_DESTINATION:-}|" \