From 5a187e1810829d86e686c9b31258eb2c64f1af9c Mon Sep 17 00:00:00 2001
From: Ian Howell <ian.howell0@gmail.com>
Date: Tue, 19 May 2020 13:05:03 -0500
Subject: [PATCH] Remove deprecated fields of remoteDirect

This change removes the deprecated "remoteType", "useProxy", and
"insecure" fields from the remoteDirect field of bootstrapInfo

Change-Id: I64d28b715b81464c871f99ad0348fadc2e9fc5f6
Relates-To: #242
---
 pkg/clusterctl/cmd/testdata/airshipconfig.yaml           | 1 -
 pkg/phase/apply/testdata/config.yaml                     | 1 -
 roles/airshipctl-test-configs/templates/airshipconfig.j2 | 3 ---
 testdata/k8s/config.yaml                                 | 1 -
 4 files changed, 6 deletions(-)

diff --git a/pkg/clusterctl/cmd/testdata/airshipconfig.yaml b/pkg/clusterctl/cmd/testdata/airshipconfig.yaml
index d9566c1eb..d46839ff6 100644
--- a/pkg/clusterctl/cmd/testdata/airshipconfig.yaml
+++ b/pkg/clusterctl/cmd/testdata/airshipconfig.yaml
@@ -11,7 +11,6 @@ bootstrapInfo:
       outputMetadataFileName: output-metadata.yaml
     remoteDirect:
       isoUrl: http://localhost:8099/debian-custom.iso
-      remoteType: redfish
 clusters:
   dummycluster:
     clusterType:
diff --git a/pkg/phase/apply/testdata/config.yaml b/pkg/phase/apply/testdata/config.yaml
index 97635df0d..00a65f560 100644
--- a/pkg/phase/apply/testdata/config.yaml
+++ b/pkg/phase/apply/testdata/config.yaml
@@ -11,7 +11,6 @@ bootstrapInfo:
       outputMetadataFileName: output-metadata.yaml
     remoteDirect:
       isoUrl: http://localhost:8099/debian-custom.iso
-      remoteType: redfish
 clusters:
   dummycluster:
     clusterType:
diff --git a/roles/airshipctl-test-configs/templates/airshipconfig.j2 b/roles/airshipctl-test-configs/templates/airshipconfig.j2
index 06b9dffe9..4157f0bff 100644
--- a/roles/airshipctl-test-configs/templates/airshipconfig.j2
+++ b/roles/airshipctl-test-configs/templates/airshipconfig.j2
@@ -6,9 +6,6 @@ bootstrapInfo:
       image: {{ airship_config_iso_builder_docker_image }}
       containerRuntime: docker
     remoteDirect:
-      remoteType: {{ remote_type }}
-      insecure: {{ remote_insecure }}
-      useproxy: {{ remote_proxy }}
       isoUrl: http://{{ airship_config_iso_serve_host }}:{{ airship_config_iso_port }}/{{ airship_config_iso_name }}
     builder:
       userDataFileName: user-data
diff --git a/testdata/k8s/config.yaml b/testdata/k8s/config.yaml
index cbd4c354d..d7d527d4e 100644
--- a/testdata/k8s/config.yaml
+++ b/testdata/k8s/config.yaml
@@ -11,7 +11,6 @@ bootstrapInfo:
       volume: /srv/iso:/config
     remoteDirect:
       isoUrl: http://localhost:8099/debian-custom.iso
-      remoteType: redfish
 clusters:
   default:
     clusterType: