Merge pull request #19 from equinix/e2e-plan

change size and facility for e2e tests

.github/workflows/integration.yml

@@ -18,10 +18,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        tf: [0.13.2]
+        tf: [0.14.8]
         vsphere:
-        - vmware_os: vmware_esxi_6_7
-          vcenter_iso: VMware-VCSA-all-6.7.0-14367737.iso
+        #- vmware_os: vmware_esxi_6_7
+        #  vcenter_iso: VMware-VCSA-all-6.7.0-14367737.iso
         - vmware_os: vmware_esxi_7_0
           vcenter_iso: VMware-VCSA-all-7.0.0-16189094.iso
     env:
@@ -31,10 +31,10 @@ jobs:
       TF_VAR_control_plane_node_count: 0
       TF_VAR_vcenter_iso_name: ${{ matrix.vsphere.vcenter_iso }}
       TF_VAR_vmware_os: ${{ matrix.vsphere.vmware_os }}
-      TF_VAR_esxi_host_count: 1
+      TF_VAR_esxi_host_count: 2
       TF_VAR_esxi_size: "c3.medium.x86"
       TF_VAR_router_size: "c2.medium.x86"
-      TF_VAR_facility: "dfw2"
+      TF_VAR_facility: "sjc1"
       TF_VAR_create_project : false
       # TODO only provide this to terraform steps that need it
       TF_VAR_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}

.github/workflows/terraform.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        tf: [0.13.2]
+        tf: [0.14.8]
     steps:
     - name: Checkout from Github
       uses: actions/checkout@v2

README.md

@@ -13,8 +13,8 @@ Terraform is just a single binary.  Visit their [download page](https://www.terr
 Here is an example for **macOS**:
 
 ```bash
-curl -LO https://releases.hashicorp.com/terraform/0.14.5/terraform_0.14.5_darwin_amd64.zip
-unzip terraform_0.14.5_darwin_amd64.zip
+curl -LO https://releases.hashicorp.com/terraform/0.14.8/terraform_0.14.8_darwin_amd64.zip
+unzip terraform_0.14.8_darwin_amd64.zip
 chmod +x terraform 
 sudo mv terraform /usr/local/bin/
 ```
@@ -30,7 +30,7 @@ cd terraform-metal-vsphere
 
 ## Initialize Terraform
 
-Terraform uses modules to deploy infrastructure. In order to initialize the modules your simply run: `terraform init`. This should download five modules into a hidden directory `.terraform`
+Terraform uses modules to deploy infrastructure. In order to initialize the modules your simply run: `terraform init -upgrade`. This should download five modules into a hidden directory `.terraform`
 
 ## Setup your object store
 We need an object store to download *closed source* packages such as *vCenter* and the *vSan SDK*.

outputs.tf

@@ -5,6 +5,7 @@ output "vpn_endpoint" {
 
 output "vpn_psk" {
   value       = random_string.ipsec_psk.result
+  sensitive   = true
   description = "L2TP VPN Pre-Shared Key"
 }
 
@@ -15,6 +16,7 @@ output "vpn_user" {
 
 output "vpn_password" {
   value       = random_string.vpn_pass.result
+  sensitive   = true
   description = "L2TP VPN Password"
 }
 
@@ -30,11 +32,13 @@ output "vcenter_username" {
 
 output "vcenter_password" {
   value       = random_string.sso_password.result
+  sensitive   = true
   description = "The SSO Password to login to vCenter"
 }
 
 output "vcenter_root_password" {
   value       = random_string.vcenter_password.result
+  sensitive   = true
   description = "The root password to ssh or login at the console of vCanter."
 }
 

templates/l2tp_vpn.sh

@@ -489,7 +489,7 @@ service fail2ban restart 2>/dev/null
 service ipsec restart 2>/dev/null
 service xl2tpd restart 2>/dev/null
 
-cat <<EOF
+cat > /root/vpn-creds.txt <<EOF
 
 ================================================
 

variables.tf

@@ -1,5 +1,6 @@
 variable "auth_token" {
   description = "This is your Equinix Metal API Auth token"
+  sensitive   = true
   type        = string
 }
 
@@ -166,11 +167,13 @@ variable "s3_url" {
 
 variable "s3_access_key" {
   description = "This is the access key for your S3 endpoint"
+  sensitive   = true
   default     = "S3_ACCESS_KEY"
 }
 
 variable "s3_secret_key" {
   description = "This is the secret key for your S3 endpoint"
+  sensitive   = true
   default     = "S3_SECRET_KEY"
 }
 

versions.tf

@@ -5,6 +5,7 @@ terraform {
     }
     metal = {
       source = "equinix/metal"
+      version = "~> 1.1"
     }
     random = {
       source = "hashicorp/random"
@@ -19,5 +20,5 @@ terraform {
       source = "hashicorp/local"
     }
   }
-  required_version = ">= 0.13"
-}
+  required_version = ">= 0.14"
+}