Merge pull request #32 from sap-linuxlab/dev

0.7.4 release

Author: sean-freeman

.github/workflows/terraform_ansible_software_availability.yml

@@ -4,8 +4,9 @@ on:
   # * is a special character in YAML, quote string to avoid
   # schedule uses UTC
   # only uses the main branch, to alter use 'with: ref: branch_name' for the step using actions/checkout
+  # At 05:00 on every day-of-week from Monday through Friday
   schedule:
-    - cron: '0 11,19 * * 1-5'
+    - cron: '0 5 * * 1-5'
 
   push:
     branches:

.github/workflows/terraform_validate.yml

@@ -18,12 +18,12 @@ jobs:
       max-parallel: 10
       matrix:
         terraform_ver: [~1.0.0, ~1.1.0, ~1.2.0, ~1.3.0]
-        terraform_module_parent: [all, aws_ec2_instance, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm, vmware_vm]
+        terraform_module_parent: [all, aws_ec2_instance, gcp_ce_vm, ibmcloud_vs, ibmcloud_powervs, ibmpowervc, msazure_vm, vmware_vm]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.1.0
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2.0.2
+        uses: hashicorp/setup-terraform@v2.0.3
         with:
           terraform_version: ${{ matrix.terraform_ver }}
       - name: Terraform Init

README.md

@@ -50,7 +50,7 @@ The below table lists the Terraform Modules for SAP, and any detailed documentat
 |:---|:---|
 | **TF Modules for Infrastructure Platforms** | - |
 |  Amazon Web Services Elastic Compute Cloud (EC2) Virtual Server | |
-|  ~~Google Cloud Platform Compute Engine (CE) Virtual Machine~~ | N/A |
+|  Google Cloud Platform Compute Engine (CE) Virtual Machine | N/A |
 |  IBM Cloud Virtual Servers | N/A |
 |  IBM Cloud, IBM Power Virtual Servers | |
 |  IBM Power Virtualization Center | N/A |
@@ -80,46 +80,46 @@ The below table lists the Terraform Modules for SAP, and any detailed documentat
 
 ## Infrastructure provisioning parity comparison
 
-| Infrastructure Platform | **Amazon Web Services (AWS)** | **Microsoft Azure** | **IBM Cloud** | **IBM Cloud** | **IBM PowerVC** | **VMware vSphere** |
-|:---|:---:|:---:|:---:|:---:|:---:|:---:|
-|   *Product* | EC2 Virtual Server | VM | Virtual Server | IBM Power Virtual Server | LPAR | VM |
-| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Type* | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) |
-| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Hypervisor* | KVM | HyperV | KVM | IBM PowerVM<br> (PHYP LE) | IBM PowerVM<br> (PHYP LE) | VMware vSphere |
-| <br/><br/>***Account Init*** |   |   |   |   |   |   |
-| Create Resource Group, or re-use existing Resource Group | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create VPC/VNet, or re-use existing VPC/VNet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Subnet, or re-use existing Subnet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Many-to-One NAT Gateway (Public Internet access for hosts) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| <br/>***Account Bootstrap<br/>(aka. minimal landing zone)*** |   |   |   |   |   |   |
-| Create Private DNS | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Network Interconnectivity hub (e.g. Transit Gateway) | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Network Security for Subnet/s (e.g. ACL, NSG) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Network Security for Host/s (e.g. Security Groups) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create TLS key pair for SSH (using RSA algorithm) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Import public key to Cloud platform | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| <br/>***Account IAM*** |   |   |   |   |   |   |
-| Create IAM Access Group/s and contained Policies | :x: | :x: | :warning: WIP | :x: | N/A | N/A |
-| <br/>***Bastion Injection*** |   |   |   |   |   |   |
-| Find OS Image | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Subnet for Bastion (using small CIDR prefix) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Network Security for Host/s connection from Bastion (e.g. Security Groups) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Network Security for Bastion (e.g. Security Groups) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Public IP address for Bastion | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Bastion host | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Build scripts for Bastion host:<br>     - Create OS User for bastion access<br>     - Amend SSH Authorized Keys of OS User for bastion access<br>     - Activate firewalld<br>     - Change SSH Port to within IANA Dynamic Ports range<br>     - Update SELinux of port change<br>     - Deny root login from Public IP | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| <br/>***Host Network Access for SAP*** |   |   |   |   |   |   |
-| Append Network Security rules for SAP (e.g. Security Group Rules)<br>     - SAP NetWeaver AS (ABAP)<br>     - SAP NetWeaver AS (JAVA)<br>     - SAP HANA<br>     - SAP HANA XSA<br>     - SAP Web Dispatcher | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| <br/>***Proxy interconnect provision for increased security hosts*** |   |   |   |   |   |   |
-| Find OS Image | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
-| Create Proxy host | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
-| Create DNS Records (i.e. A, CNAME, PTR) | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
-| Build scripts for Bastion host:<br>     - Setup BIND/named for DNS Proxy<br>     - Setup Squid for Web Forward Proxy<br>     - Setup Nginx for Web Reverse Proxy | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
-| <br/>***Host Provision*** |   |   |   |   |   |   |
-| Find OS Image with SAP-relevant OS   Package Repositories | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:<br/><sub>clone from Stock OS Image</sub> | :white_check_mark: | :white_check_mark: |
-| Create DNS Records (i.e. A, CNAME, PTR) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
-| Create Storage Volumes (defined storage   profile with IOPS/GB, or custom IOPS) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning:<br/><sub>no custom IOPS</sub> | :white_check_mark: | :white_check_mark: |
-| Create Host/s | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Attach Storage Volumes to Host/s | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Build scripts for Host:<br>     - Enable root login<br>     - Set hostname<br>     - Set DNS in resolv.conf<br>     - Disks and Filesystem setup (LVM with XFS and striping, or Physical with XFS) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Build scripts for increased security Hosts:<br>     - Set DNS Proxy in resolv.conf<br>     - Set Web Proxy for non-interactive login shell | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Build scripts for BYOL OS:<br>     - Enable OS Subscription with BYOL, setup OS Package Repositories | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Infrastructure Platform | **Amazon Web Services (AWS)** | **Google Cloud** | **Microsoft Azure** | **IBM Cloud** | **IBM Cloud** | **IBM PowerVC** | **VMware vSphere** |
+|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| &emsp;&emsp;*Product* | EC2 Virtual Server | VM | VM | Virtual Server | IBM Power Virtual Server | LPAR | VM |
+| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Type* | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) |
+| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Hypervisor* | KVM | KVM | HyperV | KVM | IBM PowerVM<br> (PHYP LE) | IBM PowerVM<br> (PHYP LE) | VMware vSphere |
+| <br/><br/>***Account Init*** |   |   |   |   |   |   |   |
+| Create Resource Group, or re-use existing Resource Group | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create VPC/VNet, or re-use existing VPC/VNet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Subnet, or re-use existing Subnet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Many-to-One NAT Gateway (Public Internet access for hosts) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| <br/>***Account Bootstrap<br/>(aka. minimal landing zone)*** |   |   |   |   |   |   |   |
+| Create Private DNS | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Network Interconnectivity hub (e.g. Transit Gateway) | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Network Security for Subnet/s (e.g. ACL, NSG) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Network Security for Host/s (e.g. Security Groups) | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create TLS key pair for SSH (using RSA algorithm) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Import public key to Cloud platform | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| <br/>***Account IAM*** |   |   |   |   |   |   |   |
+| Create IAM Access Group/s and contained Policies for SAP 'Basis' Administrators | :x: WIP | :x: WIP | :x: WIP | :warning: WIP | :x: WIP | N/A | N/A |
+| <br/>***Bastion Injection*** |   |   |   |   |   |   |   |
+| Find OS Image | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Subnet for Bastion (using small CIDR prefix) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Network Security for Host/s connection from Bastion (e.g. Security Groups) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Network Security for Bastion (e.g. Security Groups) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Public IP address for Bastion | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Bastion host | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Build scripts for Bastion host:<sub><br>     - Create OS User for bastion access<br>     - Amend SSH Authorized Keys of OS User for bastion access<br>     - Activate firewalld<br>     - Change SSH Port to within IANA Dynamic Ports range<br>     - Update SELinux of port change<br>     - Deny root login from Public IP</sub> | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| <br/>***Host Network Access for SAP*** |   |   |   |   |   |   |   |
+| Append Network Security rules for SAP (e.g. Security Group Rules)<sub><br>     - SAP NetWeaver AS (ABAP)<br>     - SAP NetWeaver AS (JAVA)<br>     - SAP HANA<br>     - SAP HANA XSA<br>     - SAP Web Dispatcher</sub> | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| <br/>***Proxy interconnect provision for increased security hosts*** |   |   |   |   |   |   |   |
+| Find OS Image | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
+| Create Proxy host | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
+| Create DNS Records (i.e. A, CNAME, PTR) | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
+| Build scripts for Bastion host:<sub><br>     - Setup BIND/named for DNS Proxy<br>     - Setup Squid for Web Forward Proxy<br>     - Setup Nginx for Web Reverse Proxy</sub> | N/A | N/A | N/A | N/A | :white_check_mark: | N/A | N/A |
+| <br/>***Host Provision*** |   |   |   |   |   |   |   |
+| Find OS Image with SAP-relevant OS   Package Repositories | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:<br/><sub>clone from Stock OS Image</sub> | :white_check_mark: | :white_check_mark: |
+| Create DNS Records (i.e. A, CNAME, PTR) | :white_check_mark: | :white_check_mark: | ::white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
+| Create Storage Volumes (defined storage   profile with IOPS/GB, or custom IOPS) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning:<br/><sub>no custom IOPS</sub> | :white_check_mark: | :white_check_mark: |
+| Create Host/s | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Attach Storage Volumes to Host/s | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Build scripts for Host:<sub><br>     - Enable root login<br>     - Set hostname<br>     - Set DNS in resolv.conf<br>     - Disks and Filesystem setup (LVM with XFS and striping, or Physical with XFS)</sub> | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Build scripts for increased security Hosts:<sub><br>     - Set DNS Proxy in resolv.conf<br>     - Set Web Proxy for non-interactive login shell</sub> | N/A | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Build scripts for BYOL OS:<sub><br>     - Enable OS Subscription with BYOL, setup OS Package Repositories</sub> | N/A | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |

all/ansible_sap_bw4hana_install/ansible_requirements_collections.yml

@@ -10,7 +10,7 @@ collections:
     version: 1.33.0
   - name: community.sap_install
     type: galaxy
-    version: 1.2.0
+    version: 1.2.2
 #  - name: community.sap_launchpad
 #    type: galaxy
 #    version: 0.0.0

all/ansible_sap_bw4hana_install/exec_ansible_dry_run.tf

@@ -4,7 +4,7 @@ resource "null_resource" "ansible_exec_dry_run" {
   depends_on = [local_file.ansible_extravars, local_file.bastion_rsa, local_file.hosts_rsa]
   count = local.dry_run_boolean ? 1 : 0
 
-  # for ansible-playbook, use timeout set to 60 seconds to avoid error "Connection timed out during banner exchange"
+  # for ansible-playbook, use timeout set to 180 seconds to avoid error "Connection timed out during banner exchange"
   # for ansible-playbook, use debug with connection details -vvvv if errors occur
   provisioner "local-exec" {
     command = <<EOT
@@ -15,6 +15,13 @@ resource "null_resource" "ansible_exec_dry_run" {
     export GIT_CONFIG_GLOBAL=/dev/null
     export GIT_CONFIG_SYSTEM=/dev/null
 
+    # Documentation regarding SSH and Timeout configurations
+    # https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+    # https://docs.ansible.com/ansible/latest/collections/ansible/builtin/ssh_connection.html
+
+    # Ansible Config - Default timeout for connection plugins to use. Equivilant to 'ansible-playbook --timeout 180' command, and creates SSH connection with '-o ConnectTimeout=180'.
+    export ANSIBLE_TIMEOUT=180
+
     # Ansible Config - Forces color mode when run without a TTY
     export ANSIBLE_FORCE_COLOR=1