diff --git a/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md index 3867af4932b..dbb30624f24 100644 --- a/docs/getting-started-guides/ubuntu.md +++ b/docs/getting-started-guides/ubuntu.md @@ -61,7 +61,7 @@ Then the `roles ` variable defines the role of above machine in the same order, The `NUM_MINIONS` variable defines the total number of minions. -The `SERVICE_CLUSTER_IP_RANGE` variable defines the kubernetes service portal ip range. Please make sure that you do have a valid private ip range defined here, because some IaaS provider may reserve private ips. You can use below three private network range accordin to rfc1918. Besides you'd better not choose the one that conflicts with your own private network range. +The `SERVICE_CLUSTER_IP_RANGE` variable defines the kubernetes service IP range. Please make sure that you do have a valid private ip range defined here, because some IaaS provider may reserve private ips. You can use below three private network range accordin to rfc1918. Besides you'd better not choose the one that conflicts with your own private network range. 10.0.0.0 - 10.255.255.255 (10/8 prefix) diff --git a/examples/openshift-origin/create.sh b/examples/openshift-origin/create.sh index 52c02395deb..6be3ea3a72b 100755 --- a/examples/openshift-origin/create.sh +++ b/examples/openshift-origin/create.sh @@ -23,11 +23,11 @@ cluster/kubectl.sh create -f $OPENSHIFT_EXAMPLE/openshift-service.yaml sleep 30 export PUBLIC_IP=$(cluster/kubectl.sh get services openshift --template="{{ index .spec.publicIPs 0 }}") echo $PUBLIC_IP -export PORTAL_IP=$(cluster/kubectl.sh get services openshift --template="{{ .spec.portalIP }}") -echo $PORTAL_IP +export SVC_IP=$(cluster/kubectl.sh get services openshift --template="{{ .spec.portalIP }}") +echo $SVC_IP docker run --privileged -v ${OPENSHIFT_CONFIG}:/config openshift/origin start master --write-config=/config --kubeconfig=/config/kubeconfig --master=https://localhost:8443 --public-master=https://${PUBLIC_IP}:8443 sudo -E chown ${USER} -R ${OPENSHIFT_CONFIG} docker run -i -t --privileged -e="OPENSHIFTCONFIG=/config/admin.kubeconfig" -v ${OPENSHIFT_CONFIG}:/config openshift/origin ex bundle-secret openshift-config -f /config &> ${OPENSHIFT_EXAMPLE}/secret.json cluster/kubectl.sh create -f ${OPENSHIFT_EXAMPLE}/secret.json cluster/kubectl.sh create -f ${OPENSHIFT_EXAMPLE}/openshift-controller.yaml -cluster/kubectl.sh get pods | grep openshift \ No newline at end of file +cluster/kubectl.sh get pods | grep openshift