Merge pull request #41561 from jamiehannaford/fix-multiple-swift-urls

Automatic merge from submit-queue Ensure only 1 Swift URL is used in cluster operations **What this PR does / why we need it**: Extracts only 1 Swift URL if multiple are returned from Keystone. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: https://github.com/kubernetes/kubernetes/issues/34930 **Special notes for your reviewer**: **Release note**: ```release-note Heat cluster operations now support environments that have multiple Swift URLs ```

Merge pull request #41561 from jamiehannaford/fix-multiple-swift-urls
750d5c3b · Kubernetes Submit Queue · GitHub · bd3146a2 · 708f917e · 750d5c3b
Commit 750d5c3b authored Apr 12, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.sh cluster/openstack-heat/util.sh +1 -1

No files found.
--- a/cluster/openstack-heat/util.sh
+++ b/cluster/openstack-heat/util.sh
@@ -194,7 +194,7 @@ function run-heat-script() {
    else
      rgx="publicURL: (.+)$"
    fi
-    SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "$rgx" | cut -d" " -f2)
+    SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "$rgx" | cut -d" " -f2 | head -n 1)
  fi
  local swift_repo_url="${SWIFT_SERVER_URL}/kubernetes"