@@ -10,8 +10,74 @@ import (

 	"github.com/openshift/origin/pkg/client"

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

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

 )

+func RelativizeMasterConfigPaths(config *MasterConfig, base string) error {

+	return cmdutil.RelativizePaths(GetMasterFileReferences(config), base)

+}

+

+func ResolveMasterConfigPaths(config *MasterConfig, base string) error {

+	return cmdutil.ResolvePaths(GetMasterFileReferences(config), base)

+}

+

+func GetMasterFileReferences(config *MasterConfig) []*string {

+	refs := []*string{}

+

+	refs = append(refs, &config.ServingInfo.ServerCert.CertFile)

+	refs = append(refs, &config.ServingInfo.ServerCert.KeyFile)

+	refs = append(refs, &config.ServingInfo.ClientCA)

+

+	refs = append(refs, &config.EtcdClientInfo.ClientCert.CertFile)

+	refs = append(refs, &config.EtcdClientInfo.ClientCert.KeyFile)

+	refs = append(refs, &config.EtcdClientInfo.CA)

+

+	if config.EtcdConfig != nil {

+		refs = append(refs, &config.EtcdConfig.ServingInfo.ServerCert.CertFile)

+		refs = append(refs, &config.EtcdConfig.ServingInfo.ServerCert.KeyFile)

+		refs = append(refs, &config.EtcdConfig.ServingInfo.ClientCA)

+		refs = append(refs, &config.EtcdConfig.StorageDir)

+	}

+

+	if config.OAuthConfig != nil {

+		refs = append(refs, &config.OAuthConfig.ProxyCA)

+	}

+

+	if config.AssetConfig != nil {

+		refs = append(refs, &config.AssetConfig.ServingInfo.ServerCert.CertFile)

+		refs = append(refs, &config.AssetConfig.ServingInfo.ServerCert.KeyFile)

+		refs = append(refs, &config.AssetConfig.ServingInfo.ClientCA)

+	}

+

+	refs = append(refs, &config.MasterClients.DeployerKubeConfig)

+	refs = append(refs, &config.MasterClients.OpenShiftLoopbackKubeConfig)

+	refs = append(refs, &config.MasterClients.KubernetesKubeConfig)

+

+	return refs

+}

+

+func RelativizeNodeConfigPaths(config *NodeConfig, base string) error {

+	return cmdutil.RelativizePaths(GetNodeFileReferences(config), base)

+}

+

+func ResolveNodeConfigPaths(config *NodeConfig, base string) error {

+	return cmdutil.ResolvePaths(GetNodeFileReferences(config), base)

+}

+

+func GetNodeFileReferences(config *NodeConfig) []*string {

+	refs := []*string{}

+

+	refs = append(refs, &config.ServingInfo.ServerCert.CertFile)

+	refs = append(refs, &config.ServingInfo.ServerCert.KeyFile)

+	refs = append(refs, &config.ServingInfo.ClientCA)

+

+	refs = append(refs, &config.MasterKubeConfig)

+

+	refs = append(refs, &config.VolumeDirectory)

+

+	return refs

+}

+

 func GetKubeClient(kubeConfigFile string) (*kclient.Client, *kclient.Config, error) {

 	loadingRules := &clientcmd.ClientConfigLoadingRules{CommandLinePath: kubeConfigFile}

 	loader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})

@@ -6,6 +6,8 @@ import (

 	"io/ioutil"

 	"net/http"

 	_ "net/http/pprof"

+	"os"

+	"path/filepath"

 	"strings"

 	"github.com/coreos/go-systemd/daemon"

@@ -174,6 +176,24 @@ func (o MasterOptions) RunMaster() error {

 	}

 	if o.WriteConfigOnly {

+		// Resolve relative to CWD

+		cwd, err := os.Getwd()

+		if err != nil {

+			return err

+		}

+		if err := configapi.ResolveMasterConfigPaths(masterConfig, cwd); err != nil {

+			return err

+		}

+

+		// Relativize to config file dir

+		base, err := cmdutil.MakeAbs(filepath.Dir(o.ConfigFile), cwd)

+		if err != nil {

+			return err

+		}

+		if err := configapi.RelativizeMasterConfigPaths(masterConfig, base); err != nil {

+			return err

+		}

+

 		content, err := WriteMaster(masterConfig)

 		if err != nil {

 			return err

@@ -249,6 +269,15 @@ func ReadMasterConfig(filename string) (*configapi.MasterConfig, error) {

 	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

 }

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

 	"io/ioutil"

 	"net/http"

 	_ "net/http/pprof"

+	"os"

 	"path"

 	"path/filepath"

 	"strings"

@@ -148,6 +149,24 @@ func (o NodeOptions) RunNode() error {

 	}

 	if o.WriteConfigOnly {

+		// Resolve relative to CWD

+		cwd, err := os.Getwd()

+		if err != nil {

+			return err

+		}

+		if err := configapi.ResolveNodeConfigPaths(nodeConfig, cwd); err != nil {

+			return err

+		}

+

+		// Relativize to config file dir

+		base, err := cmdutil.MakeAbs(filepath.Dir(o.ConfigFile), cwd)

+		if err != nil {

+			return err

+		}

+		if err := configapi.RelativizeNodeConfigPaths(nodeConfig, base); err != nil {

+			return err

+		}

+

 		content, err := WriteNode(nodeConfig)

 		if err != nil {

 			return err

@@ -239,6 +258,15 @@ func ReadNodeConfig(filename string) (*configapi.NodeConfig, error) {

 	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

 }

new file mode 100644

@@ -0,0 +1,49 @@

+package util

+

+import (

+	"os"

+	"path/filepath"

+)

+

+func MakeAbs(path, base string) (string, error) {

+	if filepath.IsAbs(path) {

+		return path, nil

+	}

+	if len(base) == 0 {

+		cwd, err := os.Getwd()

+		if err != nil {

+			return "", err

+		}

+		base = cwd

+	}

+	return filepath.Join(base, path), nil

+}

+

+// ResolvePaths updates the given refs to be absolute paths, relative to the given base directory

+func ResolvePaths(refs []*string, base string) error {

+	for _, ref := range refs {

+		// Don't resolve empty paths

+		if len(*ref) > 0 {

+			// Don't resolve absolute paths

+			if !filepath.IsAbs(*ref) {

+				*ref = filepath.Join(base, *ref)

+			}

+		}

+	}

+	return nil

+}

+

+// RelativizePaths updates the given refs to be relative paths, relative to the given base directory

+func RelativizePaths(refs []*string, base string) error {

+	for _, ref := range refs {

+		// Don't relativize empty paths

+		if len(*ref) > 0 {

+			rel, err := filepath.Rel(base, *ref)

+			if err != nil {

+				return err

+			}

+			*ref = rel

+		}

+	}

+	return nil

+}