@@ -38,6 +38,49 @@ func ReadAndResolveMasterConfig(filename string) (*configapi.MasterConfig, error

 	return masterConfig, nil

 }

+func ReadNodeConfig(filename string) (*configapi.NodeConfig, error) {

+	data, err := ioutil.ReadFile(filename)

+	if err != nil {

+		return nil, err

+	}

+

+	config := &configapi.NodeConfig{}

+	data, err = kyaml.ToJSON(data)

+	if err != nil {

+		return nil, err

+	}

+

+	if err := Codec.DecodeInto(data, config); err != nil {

+		return nil, err

+	}

+

+	return config, nil

+}

+

+func ReadAndResolveNodeConfig(filename string) (*configapi.NodeConfig, error) {

+	nodeConfig, err := ReadNodeConfig(filename)

+	if err != nil {

+		return nil, err

+	}

+

+	configapi.ResolveNodeConfigPaths(nodeConfig, path.Dir(filename))

+	return nodeConfig, nil

+}

+

+// WriteMaster serializes the config to yaml.

+func WriteMaster(config *configapi.MasterConfig) ([]byte, error) {

+	json, err := Codec.Encode(config)

+	if err != nil {

+		return nil, err

+	}

+

+	content, err := yaml.JSONToYAML(json)

+	if err != nil {

+		return nil, err

+	}

+	return content, err

+}

+

 // WriteNode serializes the config to yaml.

 func WriteNode(config *configapi.NodeConfig) ([]byte, error) {

 	json, err := Codec.Encode(config)

@@ -13,6 +13,7 @@ import (

 	utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

+	configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"

 	"github.com/openshift/origin/pkg/cmd/server/api/validation"

 )

@@ -361,8 +362,8 @@ func executeAllInOneCommandWithConfigs(args []string) (*MasterArgs, *configapi.M

 	root.SetArgs(argsToUse)

 	root.Execute()

-	masterCfg, masterErr := ReadMasterConfig(fakeMasterConfigFile.Name())

-	nodeCfg, nodeErr := ReadNodeConfig(fakeNodeConfigFile.Name())

+	masterCfg, masterErr := configapilatest.ReadAndResolveMasterConfig(fakeMasterConfigFile.Name())

+	nodeCfg, nodeErr := configapilatest.ReadAndResolveNodeConfig(fakeNodeConfigFile.Name())

 	return cfg.MasterArgs, masterCfg, masterErr, cfg.NodeArgs, nodeCfg, nodeErr

 }

@@ -7,7 +7,6 @@ import (

 	"strconv"

 	"code.google.com/p/go-uuid/uuid"

-	"github.com/ghodss/yaml"

 	"github.com/golang/glog"

 	"github.com/spf13/pflag"

@@ -18,7 +17,6 @@ import (

 	"github.com/openshift/origin/pkg/cmd/flagtypes"

 	"github.com/openshift/origin/pkg/cmd/server/admin"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

-	latestconfigapi "github.com/openshift/origin/pkg/cmd/server/api/latest"

 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

@@ -566,17 +564,3 @@ func getPort(theURL url.URL) int {

 	intport, _ := strconv.Atoi(port)

 	return intport

 }

-

-// WriteMaster serializes the config to yaml.

-func WriteMaster(config *configapi.MasterConfig) ([]byte, error) {

-	json, err := latestconfigapi.Codec.Encode(config)

-	if err != nil {

-		return nil, err

-	}

-

-	content, err := yaml.JSONToYAML(json)

-	if err != nil {

-		return nil, err

-	}

-	return content, err

-}

@@ -14,7 +14,6 @@ import (

 	"github.com/openshift/origin/pkg/cmd/server/admin"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

-	latestconfigapi "github.com/openshift/origin/pkg/cmd/server/api/latest"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

@@ -104,15 +103,6 @@ func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, erro

 	return config, nil

 }

-// WriteNode serializes the config to yaml.

-func WriteNode(config *configapi.NodeConfig) ([]byte, error) {

-	json, err := latestconfigapi.Codec.Encode(config)

-	if err != nil {

-		return nil, err

-	}

-	return json, err

-}

-

 // defaultHostname returns the default hostname for this system.

 func defaultHostname() (string, error) {

@@ -16,7 +16,6 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

-	kyaml "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml"

 	"github.com/openshift/origin/pkg/cmd/server/admin"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

@@ -180,7 +179,7 @@ func (o MasterOptions) RunMaster() error {

 	var masterConfig *configapi.MasterConfig

 	var err error

 	if startUsingConfigFile {

-		masterConfig, err = ReadMasterConfig(o.ConfigFile)

+		masterConfig, err = configapilatest.ReadAndResolveMasterConfig(o.ConfigFile)

 	} else {

 		masterConfig, err = o.MasterArgs.BuildSerializeableMasterConfig()

 	}

@@ -207,7 +206,7 @@ func (o MasterOptions) RunMaster() error {

 			return err

 		}

-		content, err := WriteMaster(masterConfig)

+		content, err := configapilatest.WriteMaster(masterConfig)

 		if err != nil {

 			return err

 		}

@@ -271,29 +270,6 @@ func (o MasterOptions) CreateCerts() error {

 	return nil

 }

-func ReadMasterConfig(filename string) (*configapi.MasterConfig, error) {

-	data, err := ioutil.ReadFile(filename)

-	if err != nil {

-		return nil, err

-	}

-

-	config := &configapi.MasterConfig{}

-	data, err = kyaml.ToJSON(data)

-	if err := configapilatest.Codec.DecodeInto(data, config); err != nil {

-		return nil, err

-	}

-

-	base, err := cmdutil.MakeAbs(filepath.Dir(filename), "")

-	if err != nil {

-		return nil, err

-	}

-	if err := configapi.ResolveMasterConfigPaths(config, base); err != nil {

-		return nil, err

-	}

-

-	return config, nil

-}

-

 func StartMaster(openshiftMasterConfig *configapi.MasterConfig) error {

 	glog.Infof("Starting an OpenShift master, reachable at %s (etcd: %v)", openshiftMasterConfig.ServingInfo.BindAddress, openshiftMasterConfig.EtcdClientInfo.URLs)

 	glog.Infof("OpenShift master public address is %s", openshiftMasterConfig.AssetConfig.MasterPublicURL)

@@ -140,7 +140,7 @@ func (o NodeOptions) RunNode() error {

 	var nodeConfig *configapi.NodeConfig

 	var err error

 	if startUsingConfigFile {

-		nodeConfig, err = ReadNodeConfig(o.ConfigFile)

+		nodeConfig, err = configapilatest.ReadAndResolveNodeConfig(o.ConfigFile)

 	} else {

 		nodeConfig, err = o.NodeArgs.BuildSerializeableNodeConfig()

 	}

@@ -167,7 +167,7 @@ func (o NodeOptions) RunNode() error {

 			return err

 		}

-		content, err := WriteNode(nodeConfig)

+		content, err := configapilatest.WriteNode(nodeConfig)

 		if err != nil {

 			return err

 		}

@@ -255,29 +255,6 @@ func (o NodeOptions) CreateCerts() error {

 	return nil

 }

-func ReadNodeConfig(filename string) (*configapi.NodeConfig, error) {

-	data, err := ioutil.ReadFile(filename)

-	if err != nil {

-		return nil, err

-	}

-

-	config := &configapi.NodeConfig{}

-

-	if err := configapilatest.Codec.DecodeInto(data, config); err != nil {

-		return nil, err

-	}

-

-	base, err := cmdutil.MakeAbs(filepath.Dir(filename), "")

-	if err != nil {

-		return nil, err

-	}

-	if err := configapi.ResolveNodeConfigPaths(config, base); err != nil {

-		return nil, err

-	}

-

-	return config, nil

-}

-

 func StartNode(config configapi.NodeConfig) error {

 	nodeConfig, err := kubernetes.BuildKubernetesNodeConfig(config)

 	if err != nil {