Skip to content

openshift start master should not automatically create a node entry #1... #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brenton wants to merge 1 commit into from
Closed

openshift start master should not automatically create a node entry #1... #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/cmd/server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ func (cfg Config) GetNodeList() []string {
nodeList = append(nodeList, curr)
}

if len(nodeList) == 1 && nodeList[0] == "127.0.0.1" {
nodeList[0] = cfg.Hostname
}
for i, s := range nodeList {
s = strings.ToLower(s)
nodeList[i] = s
Expand Down
8 changes: 8 additions & 0 deletions pkg/cmd/server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,20 @@ func (cfg Config) Start(args []string) error {
if cfg.MasterPublicAddr.Provided {
glog.Infof("OpenShift master public address is %s", cfg.MasterPublicAddr.String())
}
if len(cfg.NodeList) == 1 && cfg.NodeList[0] == "127.0.0.1" {
cfg.NodeList[0] = cfg.Hostname
}

case cfg.StartMaster:
glog.Infof("Starting an OpenShift master, reachable at %s (etcd: %s)", cfg.MasterAddr.String(), cfg.EtcdAddr.String())
if cfg.MasterPublicAddr.Provided {
glog.Infof("OpenShift master public address is %s", cfg.MasterPublicAddr.String())
}
// TODO: refactor the start command to have master and node subcommands.
// Then make sure the default NodeList doesn't pollute the master command.
if len(cfg.NodeList) == 1 && cfg.NodeList[0] == "127.0.0.1" {
cfg.NodeList = []string{}
}

case cfg.StartNode:
glog.Infof("Starting an OpenShift node, connecting to %s", cfg.MasterAddr.String())
Expand Down