From 707ef2ce762e25699ff5356a80e3ba99b7d47a46 Mon Sep 17 00:00:00 2001 From: Elson O Rodriguez Date: Mon, 18 Apr 2016 09:16:31 -0700 Subject: [PATCH] Adding missing variable defaults for OpenStack provider. --- cluster/openstack/config-default.sh | 9 +++++++++ cluster/openstack/openrc-default.sh | 1 + cluster/openstack/openrc-swift.sh | 1 + 3 files changed, 11 insertions(+) diff --git a/cluster/openstack/config-default.sh b/cluster/openstack/config-default.sh index 034f73ca613..98f4bc5b662 100644 --- a/cluster/openstack/config-default.sh +++ b/cluster/openstack/config-default.sh @@ -58,3 +58,12 @@ STACK_CREATE_TIMEOUT=${STACK_CREATE_TIMEOUT:-60} # Enable Proxy, if true kube-up will apply your current proxy settings(defined by *_PROXY environment variables) to the deployment. ENABLE_PROXY=${ENABLE_PROXY:-false} + +# Per-protocol proxy settings. +FTP_PROXY=${FTP_PROXY:-} +HTTP_PROXY=${HTTP_PROXY:-} +HTTPS_PROXY=${HTTPS_PROXY:-} +SOCKS_PROXY=${SOCKS_PROXY:-} + +# IPs and Domains that bypass the proxy. +NO_PROXY=${NO_PROXY:-} diff --git a/cluster/openstack/openrc-default.sh b/cluster/openstack/openrc-default.sh index 9071e258f25..2583d5c2cd1 100644 --- a/cluster/openstack/openrc-default.sh +++ b/cluster/openstack/openrc-default.sh @@ -23,3 +23,4 @@ export OS_PASSWORD=${OS_PASSWORD:-secretsecret} export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0} export OS_TENANT_NAME=${OS_TENANT_NAME:-admin} export OS_TENANT_ID=${OS_TENANT_ID:-ed51b98b40944d89a449592eb67431eb} +export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne} diff --git a/cluster/openstack/openrc-swift.sh b/cluster/openstack/openrc-swift.sh index daad5704347..8ba761f0d1a 100644 --- a/cluster/openstack/openrc-swift.sh +++ b/cluster/openstack/openrc-swift.sh @@ -24,3 +24,4 @@ export OS_PASSWORD=${OS_PASSWORD:-secretsecret} export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0} export OS_TENANT_NAME=${OS_TENANT_NAME:-admin} export OS_TENANT_ID=${OS_TENANT_ID:-ed51b98b40944d89a449592eb67431eb} +export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}