From b2ca4f734dd7fca7b3333f2cc0f4b8e0f1fa0976 Mon Sep 17 00:00:00 2001 From: Manuel Romero Date: Wed, 27 Nov 2019 17:32:43 +0100 Subject: [PATCH] kubernetes --- server/scenarios_templates/azqmi-qdc-ss/qs_vm.tf | 6 +++--- server/scenarios_templates/azqmi-qseok/aks.tf | 4 ++-- server/scenarios_templates/azqmi-qseok/scenario.tfvars | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/scenarios_templates/azqmi-qdc-ss/qs_vm.tf b/server/scenarios_templates/azqmi-qdc-ss/qs_vm.tf index d91969d..647f9ca 100644 --- a/server/scenarios_templates/azqmi-qdc-ss/qs_vm.tf +++ b/server/scenarios_templates/azqmi-qdc-ss/qs_vm.tf @@ -50,7 +50,7 @@ resource "azurerm_virtual_machine" "qdc" { "Cost Center" = "3100" } - /*provisioner "remote-exec" { + provisioner "remote-exec" { connection { type = "ssh" host = azurerm_network_interface.qdc-nic.private_ip_address @@ -93,8 +93,8 @@ resource "azurerm_virtual_machine" "qdc" { } inline = [ "echo ${var.administrator_pass} | sudo -S chmod u+x /home/${var.administrator}/install/scripts/*.sh", - "sudo /home/${var.administrator}/install/scripts/echo.sh" + "sudo /home/${var.administrator}/install/scripts/start-services.sh" ] - }*/ + } } diff --git a/server/scenarios_templates/azqmi-qseok/aks.tf b/server/scenarios_templates/azqmi-qseok/aks.tf index a57e4cb..cb1f137 100644 --- a/server/scenarios_templates/azqmi-qseok/aks.tf +++ b/server/scenarios_templates/azqmi-qseok/aks.tf @@ -42,14 +42,14 @@ resource "azurerm_kubernetes_cluster" "k8scluster" { "Cost Center" = "3100" } - /*provisioner "local-exec" { + provisioner "local-exec" { command = "${var.client_type == "linux"? var.linux_script : var.client_type == "mac"? var.mac_script : var.windows_script}" environment = { AKS_NAME = "${var.cluster_name}" AKS_RG = "${var.resource_group_name}" AKS_SUBSCRIPTION = "${var.subscription_id}" } - }*/ + } } /*data "azuread_service_principal" "akssp" { diff --git a/server/scenarios_templates/azqmi-qseok/scenario.tfvars b/server/scenarios_templates/azqmi-qseok/scenario.tfvars index 7632d7a..b89fd6f 100644 --- a/server/scenarios_templates/azqmi-qseok/scenario.tfvars +++ b/server/scenarios_templates/azqmi-qseok/scenario.tfvars @@ -3,7 +3,7 @@ client_id = "b2cabfb1-fffc-40d2-a0f8-a91b2ee92e50" client_secret = "4175c906-59ba-4f38-af30-393513fa74e8" subscription_id = "a2716055-c172-463a-88f6-46c34305a3e9" -client_type = "mac" +client_type = "linux" vm_type = "Standard_DS2_v2" agent_count = 2