triton-kubernetes#161 The -module option is no longer supported since Terraform 0.12

.gitignore

@@ -1,3 +1,4 @@
+**/.vscode
 bin/terraform*
 */terraform.tfstate*
 terraform/.terraform*

create/manager_triton.go

@@ -42,6 +42,10 @@ type tritonManagerTerraformConfig struct {
 	MasterTritonMachinePackage string   `json:"master_triton_machine_package,omitempty"`
 }
 
+type typeManagerOutput struct {
+	Value string `json:"value"`
+}
+
 func newTritonManager(currentState state.State, name string) error {
 	nonInteractiveMode := viper.GetBool("non-interactive")
 
@@ -54,6 +58,18 @@ func newTritonManager(currentState state.State, name string) error {
 		baseManagerTerraformConfig: baseConfig,
 	}
 
+	rancherAccessKeyOtpt := typeManagerOutput{
+		Value: "${module.cluster-manager.rancher_access_key}",
+	}
+
+	rancherSecretKeyOtpt := typeManagerOutput{
+		Value: "${module.cluster-manager.rancher_secret_key}",
+	}
+
+	rancherUrlKeyOtpt := typeManagerOutput{
+		Value: "${module.cluster-manager.rancher_url}",
+	}
+
 	// Triton Account
 	if viper.IsSet("triton_account") {
 		cfg.TritonAccount = viper.GetString("triton_account")
@@ -394,6 +410,9 @@ func newTritonManager(currentState state.State, name string) error {
 	}
 
 	currentState.SetManager(&cfg)
+	currentState.SetOutput(&rancherUrlKeyOtpt, "rancher_url")
+	currentState.SetOutput(&rancherAccessKeyOtpt, "rancher_access_key")
+	currentState.SetOutput(&rancherSecretKeyOtpt, "rancher_secret_key")
 
 	return nil
 }

shell/run_terraform.go

@@ -140,7 +140,7 @@ func RunTerraformDestroyWithState(currentState state.State, args []string) error
 	}
 
 	// Run terraform destroy
-	allArgs := append([]string{"destroy", "-force"}, args...)
+	allArgs := append([]string{"destroy", "-auto-approve"}, args...)
 	err = runShellCommand(&shellOptions, "terraform", allArgs...)
 	if err != nil {
 		return err
@@ -182,7 +182,7 @@ func RunTerraformOutputWithState(state state.State, moduleName string) error {
 	}
 
 	// Run terraform output
-	err = runShellCommand(&shellOptions, "terraform", "output", "-module", moduleName)
+	err = runShellCommand(&shellOptions, "terraform", "output")
 	if err != nil {
 		return err
 	}

state/state.go

@@ -42,6 +42,15 @@ func (state *State) SetManager(obj interface{}) error {
 	return nil
 }
 
+func (state *State) SetOutput(obj interface{}, outputName string) error {
+	_, err := state.configJSON.SetP(obj, fmt.Sprintf("output.%s", outputName))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (state *State) SetTerraformBackendConfig(tfBackendPath string, tfBackendObj interface{}) error {
 	_, err := state.configJSON.SetP(tfBackendObj, tfBackendPath)
 	if err != nil {

terraform/modules/bare-metal-rancher-k8s-host/main.tf

@@ -32,10 +32,9 @@ resource "null_resource" "install_rancher_agent" {
   }
 
   provisioner "remote-exec" {
-    inline = <<EOF
-      ${data.template_file.install_rancher_agent.rendered}
-
-EOF
+    inline = [
+      "${data.template_file.install_rancher_agent.rendered}"
+    ]
 
   }
 }

terraform/modules/bare-metal-rancher/main.tf

@@ -31,11 +31,9 @@ resource "null_resource" "install_docker" {
   }
 
   provisioner "remote-exec" {
-    inline = <<EOF
-      ${data.template_file.install_docker.rendered}
-
-EOF
-
+    inline = [
+      "${data.template_file.install_docker.rendered}"
+    ]
   }
 }
 
@@ -66,11 +64,9 @@ resource "null_resource" "install_rancher_master" {
   }
 
   provisioner "remote-exec" {
-    inline = <<EOF
-      ${data.template_file.install_rancher_master.rendered}
-
-EOF
-
+    inline = [
+      "${data.template_file.install_rancher_master.rendered}"
+    ]
   }
 }
 
@@ -101,10 +97,9 @@ resource "null_resource" "setup_rancher_k8s" {
   }
 
   provisioner "remote-exec" {
-    inline = <<EOF
-      ${data.template_file.setup_rancher_k8s.rendered}
-
-EOF
+    inline = [
+      "${data.template_file.setup_rancher_k8s.rendered}"
+      ]
 
   }
 }