Merge pull request #1555 from galexrt/fix_1548

Fix assignment of node address to mon in failover
This commit is contained in:
Travis Nielsen authored and GitHub committed 2018-03-08 12:15:51 -08:00
commit cf3517b225
3 files changed
+13 -7

No files matched your search

+11 -5
View File
@@ -230,11 +230,6 @@ func (c *Cluster) failoverMon(name string) error {
return fmt.Errorf("failed to create mon service. %+v", err)
}
if !c.HostNetwork {
m.PublicIP = serviceIP
c.clusterInfo.Monitors[m.Name] = mon.ToCephMon(m.Name, m.PublicIP, m.Port)
}
mConf := []*monConfig{m}
// Assign the pod to a node
@@ -242,6 +237,17 @@ func (c *Cluster) failoverMon(name string) error {
return fmt.Errorf("failed to assign pods to mons. %+v", err)
}
if c.HostNetwork {
node, ok := c.mapping.Node[m.Name]
if !ok {
return fmt.Errorf("mon %s doesn't exist in assignment map", m.Name)
}
m.PublicIP = node.Address
} else {
m.PublicIP = serviceIP
}
c.clusterInfo.Monitors[m.Name] = mon.ToCephMon(m.Name, m.PublicIP, m.Port)
// Start the pod
if err = c.startPods(mConf); err != nil {
return fmt.Errorf("failed to start new mon %s. %+v", m.Name, err)
+1 -1
View File
@@ -224,7 +224,7 @@ func (c *Cluster) initMonIPs(mons []*monConfig) error {
logger.Infof("setting mon endpoints for hostnetwork mode")
node, ok := c.mapping.Node[m.Name]
if !ok {
return fmt.Errorf("mon doesn't exit in assignment map")
return fmt.Errorf("mon doesn't exist in assignment map")
}
m.PublicIP = node.Address
} else {
+1 -1
View File
@@ -60,7 +60,7 @@ func newTestStartCluster(namespace string) *clusterd.Context {
func newCluster(context *clusterd.Context, namespace string, hostNetwork bool, resources v1.ResourceRequirements) *Cluster {
return &Cluster{
HostNetwork: true,
HostNetwork: hostNetwork,
context: context,
Namespace: namespace,
Version: "myversion",