Merge pull request #37262 from yuanying/add-missing-required-value

Automatic merge from submit-queue Add missing variable to openstack provider `FIXED_NETWORK_CIDR` environment variable is mandatory by openstack-heat kubernetes provider, but it's missing as default value. Adding this environment variable is helpful to build kubernetes cluster using openstack-heat provider. So this patch adds it.

Merge pull request #37262 from yuanying/add-missing-required-value
305528d7 · Kubernetes Submit Queue · GitHub · 68cd97a5 · 6d7195fd · 305528d7
Commit 305528d7 authored Nov 28, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

config-default.sh cluster/openstack-heat/config-default.sh +2 -0

No files found.
--- a/cluster/openstack-heat/config-default.sh
+++ b/cluster/openstack-heat/config-default.sh
@@ -37,6 +37,8 @@ EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-public}

 LBAAS_VERSION=${LBAAS_VERSION:-}

+FIXED_NETWORK_CIDR=${FIXED_NETWORK_CIDR:-10.0.0.0/24}
+
 SWIFT_SERVER_URL=${SWIFT_SERVER_URL:-}

 # Flag indicates if new image must be created. If 'false' then image with IMAGE_ID will be used.