@@ -164,6 +164,9 @@ func (o AllInOneOptions) Validate(args []string) error {

 		return errors.New("config directory must have a value")

 	}

+	if len(o.NodeArgs.NodeName) == 0 {

+		return errors.New("--hostname must have a value")

+	}

 	// if we are not starting up using a config file, run the argument validation

 	if !o.IsRunFromConfig() {

 		if err := o.MasterOptions.MasterArgs.Validate(); err != nil {

@@ -45,6 +45,7 @@ os::cmd::expect_failure_and_text 'openshift start network --config=${NODECONFIG}

 os::cmd::expect_failure_and_text 'openshift start node' 'kubeconfig must be set'

 os::cmd::expect_failure_and_text 'openshift start node --config=${NODECONFIG} --disable=other' 'the following components are not recognized: other'

 os::cmd::expect_failure_and_text 'openshift start node --config=${NODECONFIG} --disable=kubelet,proxy,plugins' 'at least one node component must be enabled \(kubelet, plugins, proxy\)'

+os::cmd::expect_failure_and_text 'openshift start --write-config=/tmp/test --hostname=""' 'error: --hostname must have a value'

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/admin/manage-node"