Merge pull request #103 from IBM/skipReboot

Skip Reboot Development

Author: SunithaGudisagarIBM1

README.md

@@ -191,6 +191,8 @@ resource_group_name | string | Optional | The resource group name to use. If not
 | |
 ssh_key_type | string | Optional | The type of ssh key to use(`rsa`/`ed25519`). If not specified, IBM packer plugin uses `rsa` type as default.
 | |
+skip_reboot | bool | Optional | Skip reboot instance step. If not specified, IBM packer plugin uses `false` as default.
+| |
 vsi_base_image_id | string | Required | The base image identifier used to created the VSI. Use `ibmcloud is images` for available options.
 | OR |
 vsi_base_image_name | string | Required | The base image name used to created the VSI. Use `ibmcloud is images` for available options.

builder/ibmcloud/vpc/config.go

@@ -63,7 +63,8 @@ type Config struct {
 	StorageBucketName string `mapstructure:"storage_bucket_name"`
 	StorageBucketCRN  string `mapstructure:"storage_bucket_crn"`
 	//The format to use for the exported image. If the image is encrypted, only qcow2 is supported.
-	Format string `mapstructure:"format"`
+	Format     string `mapstructure:"format"`
+	SkipReboot bool   `mapstructure:"skip_reboot"`
 }
 
 // Prepare processes the build configuration parameters.

builder/ibmcloud/vpc/config.hcl2spec.go

@@ -16,42 +16,45 @@ func (s *stepRebootInstance) Run(_ context.Context, state multistep.StateBag) mu
 	config := state.Get("config").(Config)
 	ui := state.Get("ui").(packer.Ui)
 
-	ui.Say("Rebooting instance to cleanly complete any installed software components...")
-
-	instanceData := state.Get("instance_data").(*vpcv1.Instance)
-	instanceID := *instanceData.ID
-
-	status, err := client.manageInstance(instanceID, "reboot", state)
-	if err != nil {
-		err := fmt.Errorf("[ERROR] Error rebooting the instance: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		// log.Fatalf(err.Error())
-		return multistep.ActionHalt
-	}
+	if config.SkipReboot {
+		ui.Say("Rebooting instance to cleanly complete any installed software components...")
+
+		instanceData := state.Get("instance_data").(*vpcv1.Instance)
+		instanceID := *instanceData.ID
 
-	if status != "running" {
-		err := client.waitForResourceReady(instanceID, "instances", config.StateTimeout, state)
+		status, err := client.manageInstance(instanceID, "reboot", state)
 		if err != nil {
 			err := fmt.Errorf("[ERROR] Error rebooting the instance: %s", err)
 			state.Put("error", err)
 			ui.Error(err.Error())
 			// log.Fatalf(err.Error())
 			return multistep.ActionHalt
 		}
-	}
 
-	newInstanceData, err := client.retrieveResource(instanceID, state)
-	if err != nil {
-		err := fmt.Errorf("[ERROR] Error updating the instance: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		// log.Fatalf(err.Error())
-		return multistep.ActionHalt
-	}
-	state.Put("instance_data", newInstanceData)
+		if status != "running" {
+			err := client.waitForResourceReady(instanceID, "instances", config.StateTimeout, state)
+			if err != nil {
+				err := fmt.Errorf("[ERROR] Error rebooting the instance: %s", err)
+				state.Put("error", err)
+				ui.Error(err.Error())
+				// log.Fatalf(err.Error())
+				return multistep.ActionHalt
+			}
+		}
 
-	ui.Say("Instance is ACTIVE!")
+		newInstanceData, err := client.retrieveResource(instanceID, state)
+		if err != nil {
+			err := fmt.Errorf("[ERROR] Error updating the instance: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			// log.Fatalf(err.Error())
+			return multistep.ActionHalt
+		}
+		state.Put("instance_data", newInstanceData)
+
+		ui.Say("Instance is ACTIVE!")
+		return multistep.ActionContinue
+	}
 	return multistep.ActionContinue
 }
 

builder/ibmcloud/vpc/step_reboot_instance.go

@@ -90,3 +90,7 @@ run-zprofile:
 run-rhel-post-processor:
 	cd ..; packer validate -var-file="developer/variables.pkrvars.hcl" developer/examples/postprocessor.vpc.rhel.pkr.hcl
 	cd ..; packer build -var-file="developer/variables.pkrvars.hcl" developer/examples/postprocessor.vpc.rhel.pkr.hcl
+
+run-rhel-skip-reboot:
+	cd ..; packer validate -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.rhel.pkr.hcl
+	cd ..; packer build -var-file="developer/variables.pkrvars.hcl" developer/examples/build.vpc.rhel.skip.reboot.pkr.hcl

developer/Makefile

@@ -0,0 +1,70 @@
+// packer {
+//   required_plugins {
+//     ibmcloud = {
+//       version = ">=v3.0.0"
+//       source = "github.com/IBM/ibmcloud"
+//     }
+//   }
+// }
+
+variable "IBM_API_KEY" {
+  type = string
+}
+
+variable "SUBNET_ID" {
+  type = string
+}
+
+variable "REGION" {
+  type = string
+}
+
+variable "RESOURCE_GROUP_ID" {
+  type = string
+}
+
+variable "SECURITY_GROUP_ID" {
+  type = string
+}
+
+
+locals {
+  timestamp = regex_replace(timestamp(), "[- TZ:]", "")
+}
+
+source "ibmcloud-vpc" "rhel" {
+  api_key = var.IBM_API_KEY
+  region  = var.REGION
+
+  subnet_id         = var.SUBNET_ID
+  resource_group_id = var.RESOURCE_GROUP_ID
+  security_group_id = var.SECURITY_GROUP_ID
+
+  vsi_base_image_name = "ibm-redhat-8-4-minimal-amd64-3"
+  vsi_profile         = "bx2-4x16"
+  vsi_interface       = "public"
+  vsi_user_data_file  = ""
+
+  image_name = "packer-${local.timestamp}"
+
+  communicator = "ssh"
+  ssh_username = "root"
+  ssh_port     = 22
+  ssh_timeout  = "15m"
+  skip_reboot  = true
+  timeout = "30m"
+}
+
+build {
+  sources = [
+    "source.ibmcloud-vpc.rhel"
+  ]
+
+  provisioner "shell" {
+    execute_command = "{{.Vars}} bash '{{.Path}}'"
+    inline = [
+      "echo 'Hello from IBM Cloud Packer Plugin - VPC Infrastructure'",
+      "echo 'Hello from IBM Cloud Packer Plugin - VPC Infrastructure' >> /hello.txt"
+    ]
+  }
+}