Merge pull request #76 from SUSE/add-sles-12-for-aws

Fixed AWS SLES 12 support

Author: Steven Stringer

terraform/aws/inventory.tmpl

@@ -5,15 +5,15 @@ all:
 %{ for index, value in hana-pip ~}
         ${hana_hostname}${format("%02d", index + 1)}:
           ansible_host: ${value}
-          ansible_python_interpreter: /usr/bin/python3
+          %{ if hana-major-version == "12" }ansible_python_interpreter: /usr/bin/python2.7%{ else }ansible_python_interpreter: /usr/bin/python3 %{ endif }
 %{ endfor ~}
 %{ if iscsi-enabled }
     iscsi:
       hosts:
 %{ for index, value in iscsi-pip ~}
         ${iscsi_hostname}${format("%02d", index + 1)}:
           ansible_host: ${value}
-          ansible_python_interpreter: /usr/bin/python3
+          %{ if iscsi-major-version == "12" }ansible_python_interpreter: /usr/bin/python2.7%{ else }ansible_python_interpreter: /usr/bin/python3%{ endif }
 %{ endfor ~}
 %{ endif }
   hosts: null

terraform/aws/main.tf

@@ -56,6 +56,16 @@ locals {
   netweaver_os_image  = var.netweaver_os_image != "" ? var.netweaver_os_image : var.os_image
   netweaver_os_owner  = var.netweaver_os_owner != "" ? var.netweaver_os_owner : var.os_owner
 
+
+  # For SLES 12 we need to instruct ansible to use python2.7 and for SLES 15 it's python3.
+  # These locals calculate the major version of the os from the OS image but assumes the OS image format is consistent
+  # The regex is only used if the var.x_os_major is not set, so if the regex is failing, the user can manually set their major OS.
+  hana_major_version       = var.hana_os_major_version != "" ? var.hana_os_major_version : regex("-([0-9]+)-", local.hana_os_image)[0]
+  iscsi_major_version      = var.iscsi_os_major_version != "" ? var.iscsi_os_major_version : regex("-([0-9]+)-", local.iscsi_os_image)[0]
+  monitoring_major_version = var.monitoring_os_major_version != "" ? var.monitoring_os_major_version : regex("-([0-9]+)-", local.monitoring_os_image)[0]
+  drbd_major_version       = var.drdb_os_major_version != "" ? var.drdb_os_major_version : regex("-([0-9]+)-", local.drbd_os_image)[0]
+  netweaver_major_version  = var.netweaver_os_major_version != "" ? var.netweaver_os_major_version : regex("-([0-9]+)-", local.netweaver_os_image)[0]
+
   # Netweaver password checking
   # If Netweaver is not enabled, a dummy password is passed to pass the variable validation and not require
   # a password in this case

terraform/aws/outputs.tf

@@ -98,11 +98,13 @@ output "netweaver_public_name" {
 resource "local_file" "ansible_inventory" {
   content = templatefile("inventory.tmpl",
     {
-      hana_hostname  = var.hana_name,
-      hana-pip       = module.hana_node.hana_public_ip,
-      iscsi_hostname = var.iscsi_name,
-      iscsi-pip      = module.iscsi_server.iscsisrv_public_ip,
-      iscsi-enabled  = local.iscsi_enabled
+      hana_hostname       = var.hana_name,
+      hana-pip            = module.hana_node.hana_public_ip,
+      hana-major-version  = local.hana_major_version,
+      iscsi_hostname      = var.iscsi_name,
+      iscsi-pip           = module.iscsi_server.iscsisrv_public_ip,
+      iscsi-enabled       = local.iscsi_enabled,
+      iscsi-major-version = local.iscsi_major_version
   })
   filename = "inventory.yaml"
 }

terraform/aws/variables.tf

@@ -851,3 +851,37 @@ variable "pre_deployment" {
   type        = bool
   default     = false
 }
+
+#Different versions of python are used by ansible in SLES 12 and SLES 15.  The code will try and indetify the correct
+#version of SLES installed and select the appropriate version of the python interpretor for the inventory.yaml file
+#SLES 12 needs to user 2.7 and SLES 15 uses 3.0.
+#However, if the automatic selection proves problematic, the following values can be used as overrides
+variable "hana_os_major_version" {
+  description = "The major OS version of SLES for the HANA VMs.  If not set, this value will be computed.  Example: 15"
+  type        = string
+  default     = ""
+}
+
+variable "iscsi_os_major_version" {
+  description = "The major OS version of SLES for the iscsi VMs.  If not set, this value will be computed.  Example: 15"
+  type        = string
+  default     = ""
+}
+
+variable "monitoring_os_major_version" {
+  description = "The major OS version of SLES for the monitoring VMs.  If not set, this value will be computed.  Example: 15"
+  type        = string
+  default     = ""
+}
+
+variable "drdb_os_major_version" {
+  description = "The major OS version of SLES for the drdb VMs.  If not set, this value will be computed.  Example: 15"
+  type        = string
+  default     = ""
+}
+
+variable "netweaver_os_major_version" {
+  description = "The major OS version of SLES for the netweaver VMs.  If not set, this value will be computed.  Example: 15"
+  type        = string
+  default     = ""
+}

terraform/libvirt/main.tf

@@ -64,17 +64,17 @@ resource "libvirt_cloudinit_disk" "userdata" {
 
 
 module "common_variables" {
-  source                              = "../generic_modules/common_variables"
-  provider_type                       = "libvirt"
-  deployment_name                     = local.deployment_name
-  deployment_name_in_hostname         = var.deployment_name_in_hostname
-  reg_code                            = var.reg_code
-  reg_email                           = var.reg_email
-  reg_additional_modules              = var.reg_additional_modules
-  ha_sap_deployment_repo              = var.ha_sap_deployment_repo
-  additional_packages                 = var.additional_packages
-  authorized_keys                     = var.authorized_keys
-  authorized_user                     = "root"
+  source                      = "../generic_modules/common_variables"
+  provider_type               = "libvirt"
+  deployment_name             = local.deployment_name
+  deployment_name_in_hostname = var.deployment_name_in_hostname
+  reg_code                    = var.reg_code
+  reg_email                   = var.reg_email
+  reg_additional_modules      = var.reg_additional_modules
+  ha_sap_deployment_repo      = var.ha_sap_deployment_repo
+  additional_packages         = var.additional_packages
+  authorized_keys             = var.authorized_keys
+  authorized_user             = "root"
   /*
   provisioner                         = var.provisioner
   provisioning_log_level              = var.provisioning_log_level