Merge pull request #172 from yussufsh/release-4.6

Backport PRs to Release 4.6 (docs update and windows support)

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Contributing
 
-This project is [Apache 2.0 Licenced](https://github.com/ocp-power-automation/ocp4-upi-powervm/blob/master/LICENCE.txt) and welcomes external contributions. When contributing to this repository, please first discuss the change you wish to make via an [issue](https://github.com/ocp-power-automation/ocp4-upi-powervm/issues).
+This project is [Apache 2.0 Licenced](LICENCE.txt) and welcomes external contributions. When contributing to this repository, please first discuss the change you wish to make via an [issue](https://github.com/ocp-power-automation/ocp4-upi-powervm/issues).
 
-Please note we have a [code of conduct](https://github.com/ocp-power-automation/ocp4-upi-powervm/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
+Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
 
 # Issues
 
@@ -18,7 +18,7 @@ Please note we have a [code of conduct](https://github.com/ocp-power-automation/
  - Update the README.md or relevant documents with details of changes to the code. This includes variables change, added or updated feature, change in steps, dependencies change, etc.
  - Make use of proper commit message. Mention the issue# which you are planning to address eg: Fixes #38.
  - After creating the pull request ensure you implement all the review comments given if any. Pull request will be merged only when it has at least two approvals from the list of reviewers.
- - Please read [Developer Certificate of Origin](https://github.com/ocp-power-automation/ocp4-upi-powervm/blob/master/DCO1.1.txt) and sign-off your commit using command `git commit -s`.
+ - Please read [Developer Certificate of Origin](DCO1.1.txt) and sign-off your commit using command `git commit -s`.
 
 
 # Spec Formatting Conventions

README.md

@@ -9,24 +9,27 @@
 
 
 # Introduction
-This repo contains Terraform templates to help deployment of OpenShift Container Platform (OCP) 4.6.x on PowerVM LPARs.
-This assumes PowerVC is used as the IaaS layer for managing the PowerVM LPARs.
+
+The `ocp4-upi-powervm` [project](https://github.com/ocp-power-automation/ocp4-upi-powervm) provides Terraform based automation code to help the deployment of OpenShift Container Platform (OCP) 4.x on PowerVM systems managed by PowerVC.
 
 If you are using standalone PowerVM please take a look at the [following quickstart guide](https://github.com/RedHatOfficial/ocp4-helpernode/blob/devel/docs/quickstart-powervm.md)
-which uses the [ansible playbook](https://github.com/RedHatOfficial/ocp4-helpernode) to setup helper node (bastion) for OCP deployment.
+which uses the [ansible playbook](https://github.com/RedHatOfficial/ocp4-helpernode) to setup a helper node (bastion) for OCP deployment.
 
 This project also leverages the same ansible playbook internally for OCP deployment on PowerVM LPARs managed via PowerVC.
 
+!!! Note
+        For bugs/enhancement requests etc. please open a GitHub [issue](https://github.com/ocp-power-automation/ocp4-upi-powervm/issues)
 
-:heavy_exclamation_mark: *For bugs/enhancement requests etc. please open a GitHub issue*
+!!! Warning
 
-:information_source: **This (release-4.6) branch must be used with OCP 4.6.x versions only.**
+        **This (release-4.6) branch must be used with OCP 4.6.x versions only.**
 
 ## Automation Host Prerequisites
 
-The automation needs to run from a system with internet access. This could be your laptop or a VM with public internet connectivity. This automation code have been tested on the following 64-bit Operating Systems:
+The automation needs to run from a system with internet access. This could be your laptop or a VM with public internet connectivity. This automation code has been tested on the following 64-bit Operating Systems:
 - Mac OSX (Darwin)
 - Linux (x86_64)
+- Windows 10
 
 Follow the [guide](docs/automation_host_prereqs.md) to complete the prerequisites.
 
@@ -40,5 +43,5 @@ Follow the [guide](docs/ocp_prereqs_powervc.md) to complete the PowerVC prerequi
 Follow the [quickstart](docs/quickstart.md) guide for OCP installation on PowerVM LPARs managed via PowerVC
 
 ## Contributing
-Please see the [contributing doc](https://github.com/ocp-power-automation/ocp4-upi-powervm/blob/master/CONTRIBUTING.md) for more details.
+Please see the [contributing doc](CONTRIBUTING.md) for more details.
 PRs are most welcome !!

docs/automation_host_prereqs.md

@@ -1,21 +1,22 @@
 # Automation Host Prerequisites
 - [Automation Host Prerequisites](#automation-host-prerequisites)
+  - [Configure Your Firewall](#configure-your-firewall)
   - [Automation Host Setup](#automation-host-setup)
-    - [Configure Your Firewall](#configure-your-firewall)
     - [Terraform](#terraform)
     - [Git](#git)
 
-## Automation Host Setup
-
-Install the following packages on the automation host. Select the appropriate install binaries based on your automation host platform - Mac/Linux.
 
-### Configure Your Firewall
+## Configure Your Firewall
 If your system is behind a firewall, you will need to ensure the following ports are open in order to use ssh, http, and https:
 - 22, 443, 80
 
 These additional ports are required for the ocp cli (`oc`) post-install:
 - 6443
 
+## Automation Host Setup
+
+Install the following packages on the automation host. Select the appropriate install binaries based on your automation host platform - Mac/Linux/Windows.
+
 ### Terraform
 
 **Terraform >= 0.13.0**: Please refer to the [link](https://learn.hashicorp.com/terraform/getting-started/install.html) for instructions on installing Terraform. For validating the version run `terraform version` command after install.

modules/1_bastion/bastion.tf

@@ -318,6 +318,8 @@ resource "null_resource" "setup_nfs_disk" {
         inline = [
             "rm -rf mkdir ${local.storage_path}; mkdir -p ${local.storage_path}; chmod -R 755 ${local.storage_path}",
             "sudo chmod +x /tmp/create_disk_link.sh",
+            # Fix for copying file from Windows OS having CR
+            "sed -i 's/\r//g' /tmp/create_disk_link.sh",
             "/tmp/create_disk_link.sh",
             "sudo mkfs.ext4 -F /dev/${local.disk_config.disk_name}",
             "echo '/dev/${local.disk_config.disk_name} ${local.storage_path} ext4 defaults 0 0' | sudo tee -a /etc/fstab > /dev/null",

modules/1_bastion/templates/create_disk_link.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #Scan devices
 sudo rescan-scsi-bus.sh -a -m -r