Use private IP for internal communication by default.

pkg/drivers/oci/oci.go

@@ -51,6 +51,7 @@ type Driver struct {
 	Fingerprint          string
 	Image                string
 	NodeCompartmentID    string
+	PrivateIPAddress     string
 	PrivateKeyContents   string
 	PrivateKeyPassphrase string
 	PrivateKeyPath       string
@@ -219,24 +220,24 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 func (d *Driver) GetIP() (string, error) {
 	log.Debug("oci.GetIP()")
 
-	if d.IPAddress == "" {
+	if d.IPAddress == "" || d.PrivateIPAddress == "" {
 		oci, err := d.initOCIClient()
 		if err != nil {
 			return "", err
 		}
-		if d.UsePrivateIP {
-			ip, err := oci.GetPrivateIP(d.InstanceID, d.NodeCompartmentID)
-			if err != nil {
-				return "", err
-			}
-			d.IPAddress = ip
-		} else {
-			ip, err := oci.GetIPAddress(d.InstanceID, d.NodeCompartmentID)
-			if err != nil {
-				return "", err
-			}
-			d.IPAddress = ip
+		ip, err := oci.GetIPAddress(d.InstanceID, d.NodeCompartmentID)
+		if err != nil {
+			return "", err
+		}
+		privateIP, err := oci.GetPrivateIP(d.InstanceID, d.NodeCompartmentID)
+		if err != nil {
+			return "", err
 		}
+		d.IPAddress = ip
+		d.PrivateIPAddress = privateIP
+	}
+	if d.UsePrivateIP {
+		return d.PrivateIPAddress, nil
 	}
 
 	return d.IPAddress, nil
@@ -347,12 +348,14 @@ func (d *Driver) PreCreateCheck() error {
 // Remove a host
 func (d *Driver) Remove() error {
 	log.Debug("oci.Remove()")
+	log.Info("NOTICE: Please check Oracle Cloud Console or CLI to ensure there are no leftover resources.")
 
 	oci, err := d.initOCIClient()
 	if err != nil {
 		return err
 	}
 
+	log.Infof("terminating instance ID %s", d.InstanceID)
 	return oci.TerminateInstance(d.InstanceID)
 }
 

pkg/drivers/oci/oci_client.go

@@ -109,6 +109,8 @@ func (c *Client) CreateInstance(displayName, availabilityDomain, compartmentID,
 		},
 	}
 
+	log.Debugf("Launching instance with cloud-init: %s", string(createCloudInitScript()))
+
 	createResp, err := c.computeClient.LaunchInstance(context.Background(), request)
 	if err != nil {
 		return "", err
@@ -324,7 +326,7 @@ func (c *Client) getImageID(compartmentID, nodeImageName string) (*string, error
 	for _, image := range r.Items {
 		if strings.HasPrefix(*image.DisplayName, nodeImageName) {
 			if !strings.Contains(*image.DisplayName, "GPU") {
-				log.Debugf("Using node image %s", *image.DisplayName)
+				log.Infof("Provisioning node using image %s", *image.DisplayName)
 				return image.Id, nil
 			}
 		}