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.
This commit is contained in:
Kubernetes Submit Queue 2016-11-28 12:30:48 -08:00 committed by GitHub
commit 305528d7fd

View File

@ -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.