github url, variables update

azure/VARIABLES.md

@@ -30,6 +30,8 @@
 | `pull-secret-file-path` | - | The pull secret that you obtained from the [Pull Secret](https://cloud.redhat.com/openshift/install/pull-secret) page on the Red Hat OpenShift Cluster Manager site. You use this pull secret to authenticate with the services that are provided by the included authorities, including Quay.io, which serves the container images for OpenShift Container Platform components. Example: "/path/to/file/" |
 | `fips` | true | If FIPS mode is enabled, the Red Hat Enterprise Linux CoreOS (RHCOS) machines that OpenShift Container Platform runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with RHCOS instead. |
 | `admin-username` | core | Admin username for the bootnode |
+| `openshift-username` | - | Desired Openshift username |
+| `openshift-password` | - | Desired Openshift password |
 | `ssh-public-key` | - | SSH Public key to be included in the bootnode and all the nodes in the cluster. Example: "ssh-rsa AAAAB3Nza..." |
 | `ssh-private-key-file-path` | - | Path to the private key file of the corresponding SSH public key used to allow terraform run commands remotely. Example: "/path/to/file/" |
 | `private-or-public-cluster` | public | Public or Private. Set publish to Private to deploy a cluster which cannot be accessed from the internet. See [documentation](https://docs.openshift.com/container-platform/4.3/installing/installing_azure/installing-azure-private.html#private-clusters-default_installing-azure-private) for more details. |

azure/azure_infra/cpd-install.tf

@@ -27,7 +27,7 @@ resource "null_resource" "cpd_config" {
     provisioner "remote-exec" {
         inline = [
             #CPD Config
-            "sudo wget ${var.artifacts-location}/cpdinstaller/cpd-linux\"${var.artifacts-token}\" -O /usr/local/bin/cpd-linux",
+            "sudo wget https://raw.githubusercontent.com/IBM/cp4d-deployment/master/azure/cpd_module/cpd-linux -O /usr/local/bin/cpd-linux",
             "sudo chmod +x /usr/local/bin/cpd-linux",
             "mkdir -p ${local.installerhome}",
             "cat > ${local.installerhome}/repo.yaml <<EOL\n${data.template_file.repo.rendered}\nEOL",

azure/azure_infra/variables.tf

@@ -223,12 +223,4 @@ variable "spss"{
 variable "accept-cpd-license" {
   description = "Read and accept license at https://ibm.biz/BdqSw4"
   default = "reject"
-}
-
-variable "artifacts-location" {
-  default = "https://cpdthree.blob.core.windows.net"
-}
-
-variable "artifacts-token" {
-  default = "?se=2020-12-31T23%3A59%3A00Z&sp=r&sv=2018-03-28&ss=b&srt=sco&sig=Z99xvqpTlfrxLGGKShZ3Hv3hw6XkVGi4RnGRoajf5r0%3D"
 }