Move --print-ip from openshift start to openshift start master

Author: smarterclayton

hack/lib/start.sh

@@ -539,7 +539,7 @@ function os::start::internal::determine_hostnames() {
 	local hostnames
 	hostnames="${PUBLIC_MASTER_HOST},"
 	hostnames+="localhost,172.30.0.1,"
-	for address in $(openshift start --print-ip); do
+	for address in $(openshift start master --print-ip); do
 		hostnames+="${address},"
 	done
 	hostnames+="kubernetes.default.svc.cluster.local,"

hack/lib/util/environment.sh

@@ -169,7 +169,7 @@ readonly -f os::util::environment::setup_tmpdir_vars
 function os::util::environment::setup_kubelet_vars() {
     KUBELET_SCHEME="${KUBELET_SCHEME:-https}"
     export KUBELET_SCHEME
-    KUBELET_BIND_HOST="${KUBELET_BIND_HOST:-$(openshift start --print-ip || echo "127.0.0.1")}"
+    KUBELET_BIND_HOST="${KUBELET_BIND_HOST:-$(openshift start master --print-ip || echo "127.0.0.1")}"
     export KUBELET_BIND_HOST
     KUBELET_HOST="${KUBELET_HOST:-${KUBELET_BIND_HOST}}"
     export KUBELET_HOST
@@ -232,7 +232,7 @@ function os::util::environment::setup_server_vars() {
     KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
     export KUBE_CACHE_MUTATION_DETECTOR
 
-    API_BIND_HOST="${API_BIND_HOST:-$(openshift start --print-ip || echo "127.0.0.1")}"
+    API_BIND_HOST="${API_BIND_HOST:-$(openshift start master --print-ip || echo "127.0.0.1")}"
     export API_BIND_HOST
     API_HOST="${API_HOST:-${API_BIND_HOST}}"
     export API_HOST

pkg/cmd/server/start/start_master.go

@@ -43,6 +43,7 @@ import (
 type MasterOptions struct {
 	MasterArgs *MasterArgs
 
+	PrintIP            bool
 	CreateCertificates bool
 	ExpireDays         int
 	SignerExpireDays   int
@@ -84,6 +85,19 @@ func NewCommandStartMaster(basename string, out, errout io.Writer) (*cobra.Comma
 		Long:  fmt.Sprintf(masterLong, basename),
 		Run: func(c *cobra.Command, args []string) {
 			kcmdutil.CheckErr(options.Complete())
+
+			if options.PrintIP {
+				u, err := options.MasterArgs.GetMasterAddress()
+				if err != nil {
+					glog.Fatal(err)
+				}
+				host, _, err := net.SplitHostPort(u.Host)
+				if err != nil {
+					glog.Fatal(err)
+				}
+				fmt.Fprintf(out, "%s\n", host)
+				return
+			}
 			kcmdutil.CheckErr(options.Validate(args))
 
 			origin.StartProfiler()
@@ -123,6 +137,7 @@ func NewCommandStartMaster(basename string, out, errout io.Writer) (*cobra.Comma
 	flags.BoolVar(&options.CreateCertificates, "create-certs", true, "Indicates whether missing certs should be created")
 	flags.IntVar(&options.ExpireDays, "expire-days", options.ExpireDays, "Validity of the certificates in days (defaults to 2 years). WARNING: extending this above default value is highly discouraged.")
 	flags.IntVar(&options.SignerExpireDays, "signer-expire-days", options.SignerExpireDays, "Validity of the CA certificate in days (defaults to 5 years). WARNING: extending this above default value is highly discouraged.")
+	flags.BoolVar(&options.PrintIP, "print-ip", false, "Print the IP that would be used if no master IP is specified and exit.")
 
 	BindMasterArgs(options.MasterArgs, flags, "")
 	BindListenArg(options.MasterArgs.ListenArg, flags, "")