fixes

vm-fromsnapshot-linux/main.tf

@@ -129,12 +129,6 @@ resource "null_resource" "post-vm-fromsnapshot-linux" {
     destination = "~"
   }
 
-  provisioner "local-exec" {
-
-    command = "echo 'User/Pass: ${local.admin_username} / ${var.initial_password}'"
-
-  }
-
   provisioner "remote-exec" {
     connection {
       type     = "ssh"

vm-qdc/main.tf

@@ -28,7 +28,7 @@ locals {
   admin_username = var.admin_username
   admin_password = random_password.password.result
 }
-
+/*
 module "qmi-nic" {
   source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//qmi-nic"
   
@@ -40,9 +40,32 @@ module "qmi-nic" {
   user_id = var.user_id
 
   isExternal = var.isExternal
+}*/
+
+module "vm-qdc-fromsnapshot" {
+
+  source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//vm-fromsnapshot-linux"
+  
+  subnet_id           = var.subnet_id
+  location            = var.location
+  resource_group_name = var.resource_group_name
+  snapshot_id         = "/subscriptions/62ebff8f-c40b-41be-9239-252d6c0c8ad9/resourceGroups/QMI-Machines/providers/Microsoft.Compute/snapshots/QDC-Install-VM-Feb2022"
+  #snapshot_uri        = "https://${local.source_container}.blob.core.windows.net/${var.image_reference}"
+  vm_type             = var.vm_type
+  disk_size_gb        = var.disk_size_gb
+  provId              = var.provId
+  is_24x7             = var.is_24x7
+  startupTime         = var.startupTime
+  shutdownTime        = var.shutdownTime
+  prefix              = var.prefix
+
+  admin_username      = "qmi"
+  initial_password    = "pcZr_UoJYg05D!Vz"
+
+  user_id             = var.user_id
 }
 
-resource "azurerm_linux_virtual_machine" "vm" {
+/*resource "azurerm_linux_virtual_machine" "vm" {
   name                = local.virtual_machine_name
   resource_group_name = var.resource_group_name
   location            = var.location
@@ -72,13 +95,53 @@ resource "azurerm_linux_virtual_machine" "vm" {
     "ShutdownTime": var.is_24x7 == false? var.shutdownTime : null
     "StartupTime": var.is_24x7 == false? var.startupTime : null
   }
+}
+*/
+
+module "linux-common" {
+
+  source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//linux-common"
+
+  depends_on = [
+    module.vm-qdc-fromsnapshot
+  ]
+  
+  os_type             = "centos"
+  private_ip_address  = module.vm-qdc-fromsnapshot.nic_private_ip_address
+  admin_username      = module.vm-qdc-fromsnapshot.admin_username
+  admin_password      = module.vm-qdc-fromsnapshot.admin_password 
+  
+}
+
+
+resource "null_resource" "post-qdc-fromsnapshot" {
+
+  depends_on = [
+    module.vm-qdc-fromsnapshot,
+    module.linux-common
+  ]
+
+  provisioner "remote-exec" {
+    connection {
+      type     = "ssh"
+      host     = module.vm-qdc-fromsnapshot.nic_private_ip_address
+      user     = module.vm-qdc-fromsnapshot.admin_username
+      password = module.vm-qdc-fromsnapshot.admin_password
+      timeout  = "3m"
+      #private_key = "${file("~/.ssh/id_rsa")}"
+    }
+
+    inline = [
+        "echo 'HOLA'",
+    ]
+  }
 
   provisioner "file" {
     connection {
         type     = "ssh"
-        host     = module.qmi-nic.private_ip_address
-        user     = local.admin_username
-        password = local.admin_password
+        host     = module.vm-qdc-fromsnapshot.nic_private_ip_address
+        user     = module.vm-qdc-fromsnapshot.admin_username
+        password = module.vm-qdc-fromsnapshot.admin_password
         timeout  = "10m"
         #private_key = "${file("~/.ssh/id_rsa")}"   
     }
@@ -89,35 +152,22 @@ resource "azurerm_linux_virtual_machine" "vm" {
   provisioner "remote-exec" {
     connection {
       type     = "ssh"
-      host     = module.qmi-nic.private_ip_address
-      user     = local.admin_username
-      password = local.admin_password
+      host     = module.vm-qdc-fromsnapshot.nic_private_ip_address
+      user     = module.vm-qdc-fromsnapshot.admin_username
+      password = module.vm-qdc-fromsnapshot.admin_password
       timeout  = "3m"
       #private_key = "${file("~/.ssh/id_rsa")}"
     }
 
     inline = [
-        "echo ${local.admin_password} | sudo -S chmod a+x /home/${local.admin_username}/scripts/feb2021/*.sh",
-        "sudo /home/${local.admin_username}/scripts/feb2021/qdc-nextgen-xml.sh '${module.qmi-nic.private_ip_address}' ${var.image_reference}",
-        "sudo /home/${local.admin_username}/scripts/feb2021/core_env_setup.sh",
-        "sudo /home/${local.admin_username}/scripts/feb2021/set-license.sh '${data.azurerm_key_vault_secret.license-sept20.value}'"
+        "echo ${module.vm-qdc-fromsnapshot.admin_password} | sudo -S chmod a+x /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2021/*.sh",
+        "echo ${module.vm-qdc-fromsnapshot.admin_password} | sudo -S chmod a+x /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2022/*.sh",
+        "sudo /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2022/qdc-prereqs.sh /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2022/qdc-scenario-config.sh",
+        "sudo /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2021/qdc-nextgen-xml.sh '${module.vm-qdc-fromsnapshot.nic_private_ip_address}' ${var.image_reference}",
+        "sudo /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2021/core_env_setup.sh",
+        "sudo /home/${module.vm-qdc-fromsnapshot.admin_username}/scripts/feb2021/set-license.sh '${data.azurerm_key_vault_secret.license-sept20.value}'"
     ]
-
   }
   
 }
 
-module "linux-common" {
-
-  source = "git::https://gitlab.com/qmi/qmi-cloud-tf-modules.git//linux-common"
-
-  depends_on = [
-    azurerm_linux_virtual_machine.vm
-  ]
-  
-  os_type             = "centos"
-  private_ip_address  = module.qmi-nic.private_ip_address
-  admin_username      = local.admin_username
-  admin_password      = local.admin_password  
-  
-}

vm-qdc/outputs.tf

@@ -1,29 +1,29 @@
 output "virtual_machine_id" {
-  value = azurerm_linux_virtual_machine.vm.id
+  value = module.vm-qdc-fromsnapshot.virtual_machine_id
 }
 
 output "virtual_machine_name" {
-  value = "${var.prefix}-${random_id.randomMachineId.hex}"
+  value =  module.vm-qdc-fromsnapshot.virtual_machine_name
 }
 
 output "admin_username" {
-  value = var.admin_username
+  value = module.vm-qdc-fromsnapshot.admin_username
 }
 
 output "admin_password" {
-  value = random_password.password.result
+  value = module.vm-qdc-fromsnapshot.admin_password
 }
 
 output "nic_id" {
-  value = module.qmi-nic.id
+  value = module.vm-qdc-fromsnapshot.nic_id
 }
 
 output "nic_private_ip_address" {
-  value = module.qmi-nic.private_ip_address
+  value = module.vm-qdc-fromsnapshot.nic_private_ip_address
 }
 
 output "nic_ip_configuration_name" {
-  value = module.qmi-nic.ip_configuration_name
+  value = module.vm-qdc-fromsnapshot.nic_ip_configuration_name
 }
 
 output "mysql_root_password" {
@@ -38,12 +38,12 @@ output "mysql_demo_password" {
   value = "Qlik1234!"
 }
 
-output "nic_fqdn" {
+/*output "nic_fqdn" {
   value = var.isExternal? module.qmi-nic.fqdn : null
 }
 
 output "nic_public_ip_address" {
   value = var.isExternal? module.qmi-nic.public_ip_address : null
-}
+}*/
 
 

vm-qdc/scripts/feb2021/qdc-nextgen-xml.sh

@@ -2,10 +2,8 @@
 
 echo "--- Start qdc-nextgen-xml.sh $1"
 echo "$2"
-BASEQDC="/usr/local/qdc"
-TOMCAT=$(ls -la $BASEQDC | grep apache-tomcat | grep '^d'| awk -F " " '{print $9}')
-TOMCAT_HOME=$BASEQDC/$TOMCAT
-
+TOMCAT_HOME="/usr/local/qdc/apache-tomcat-9.0.38"
+hostname=`hostname | cut -d"." -f1`
 BASEDIR=$(dirname "$0")
 
 if [[ $2 == *"4.9.0"* ]]; then
@@ -13,15 +11,11 @@ if [[ $2 == *"4.9.0"* ]]; then
 fi
 
 sudo cp /home/qmi/scripts/wildcard_qmi_qlik-poc_com.pfx /usr/local/qdc
-sudo cp /tmp/podium/config/qlikContainers.service /etc/systemd/system/
-sudo systemctl daemon-reload
-sudo systemctl enable qlikContainers.service
 
 
 FILE=/usr/local/qdc/qlikcore/docker-compose-qlikContainers.yml
 if [ -f "$FILE" ]; then  
 
-    sudo cp /home/qmi/scripts/feb2022/docker-compose-qlikContainers.yml /usr/local/qdc/qlikcore/docker-compose-qlikContainers.yml
     sudo systemctl daemon-reload
     sudo service containerd restart
     sudo service docker stop

vm-qdc/scripts/feb2022/docker-compose-qlikContainers.yml

@@ -1,47 +0,0 @@
-version: "3.0"
-services:
-
- licenses:
-      image: qliktech-docker-release.jfrog.io/licenses:3.35.0
-      container_name: licenses
-      hostname: licenses
-      networks:
-        - qdc
-      ports:
-      - 9200:9200
-      environment:
-      - QLIK_CATALOG_MODE=true
-      - LOG_LEVEL=debug
-      - LICENSES_CONNECTION_STRING=host= port=5432 user=licenses password=licenses dbname=licenses sslmode=disable
-      - PERSISTENCE_CONNECT_DURATION=60s
-      #- OFFLINE=true
-      #- PROXY_URI=<proxy-server-address>
-      
- qix-engine:
-    # 88c1b341af2a = qliktech-docker-experimental.jfrog.io/engine:qdc-qlik-core
-    # 60c963ecd624 = qliktech-docker-experimental.jfrog.io/engine:qdc-qlik-core-feb-2020
-    # 170fc8740f04 = qliktech-docker-release.jfrog.io/engine:12.722.0
-    image: qliktech-docker-release.jfrog.io/engine:12.722.0
-    command: -S AcceptEULA=yes -S LicenseServiceUrl=http://licenses:9200 -S TrafficLogVerbosity=5 -S SystemLogVerbosity=5 -S ScriptLogVerbosity=5
-    networks:
-      - qdc
-    ports:
-      - 19076:9076
-      - 9090:9090
-    volumes: 
-      # On Linux, uncomment only volume containing qdc_host_root (this is default)
-      - /:/qdc_host_root
-      # On MacOS (possibly other OS as well), uncomment only volumes containing qlik-core-input and qlik-core-output
-      # - /tmp:/qlik-core-input
-      # - /tmp:/qlik-core-output
-    user: ${QLIKCORE_UID}:${QLIKCORE_GID}
-    labels:
-      qix-engine: ""
-
-
-networks:
-      qdc:
-        driver: bridge
-        ipam:
-             config:
-                 - subnet: 172.60.0.0/16