commit 6d0e1234d991d5336c1b9b5aa05b0baec368892c
Author: Drew Walters <andrew.walters@att.com>
Date:   Thu Oct 1 18:23:03 2020 +0000

    Update deployment scripts to match airshipctl
    
    New deployment scripts have been added to airshipctl but are missing
    from Treasuremap. This change updates the series of deployment scripts
    to include those recently added to airshipctl.
    
    Change-Id: Ieb827d079709a3962b35b43b1d5534ba9de20ad5

diff --git a/manifests/site/test-site/shared/catalogues/hosts.yaml b/manifests/site/test-site/shared/catalogues/hosts.yaml
index 858c607..e3a968a 100644
--- a/manifests/site/test-site/shared/catalogues/hosts.yaml
+++ b/manifests/site/test-site/shared/catalogues/hosts.yaml
@@ -9,6 +9,7 @@ metadata:
 hosts:
   m3:
     node01:
+      bootMode: UEFI
       macAddress: 52:54:00:b6:ed:31
       bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-target-1
       bmcUsername: root
@@ -19,9 +20,9 @@ hosts:
       macAddresses:
         oam: 52:54:00:9b:27:4c
         pxe: 52:54:00:b6:ed:31
-      bootMode: legacy
-      hardwareProfile: default  # defined in the hostgenerator-m3 function
+      hardwareProfile: default # defined in the hostgenerator-m3 function
     node02:
+      bootMode: UEFI
       macAddress: 52:54:00:b6:ed:02
       bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2
       bmcUsername: username
@@ -32,4 +33,17 @@ hosts:
       macAddresses:
         oam: 52:54:00:9b:27:02
         pxe: 52:54:00:b6:ed:02
-      hardwareProfile: default  # defined in the hostgenerator-m3 function
+      hardwareProfile: default # defined in the hardwareprofile-example function
+    node03:
+      bootMode: UEFI
+      macAddress: 52:54:00:b6:ed:23
+      bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-worker-1
+      bmcUsername: username
+      bmcPassword: password
+      ipAddresses:
+        oam-ipv4: 10.23.25.103
+        pxe-ipv4: 10.23.24.103
+      macAddresses:
+        oam: 52:54:00:9b:27:07
+        pxe: 52:54:00:b6:ed:23
+      hardwareProfile: default # defined in the hardwareprofile-example function
diff --git a/manifests/site/test-site/target/workers/hostgenerator/host-generation.yaml b/manifests/site/test-site/target/workers/hostgenerator/host-generation.yaml
new file mode 100644
index 0000000..e197b45
--- /dev/null
+++ b/manifests/site/test-site/target/workers/hostgenerator/host-generation.yaml
@@ -0,0 +1,10 @@
+# Site-level, phase-specific lists of hosts to generate
+# This is used by the hostgenerator-m3 function to narrow down the site-level
+# host-catalogue to just the hosts needed for a particular phase.
+apiVersion: airshipit.org/v1alpha1
+kind: VariableCatalogue
+metadata:
+  name: host-generation-catalogue
+hosts:
+  m3:
+    - node03
diff --git a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
new file mode 100644
index 0000000..5acc9b5
--- /dev/null
+++ b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml
@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3
+  - ../../../shared/catalogues/
+  - host-generation.yaml
+
+transformers:
+  - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements
diff --git a/manifests/site/test-site/target/workers/kubeadmconfigtemplate.yaml b/manifests/site/test-site/target/workers/kubeadmconfigtemplate.yaml
new file mode 100644
index 0000000..4bd8d4b
--- /dev/null
+++ b/manifests/site/test-site/target/workers/kubeadmconfigtemplate.yaml
@@ -0,0 +1,48 @@
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+kind: KubeadmConfigTemplate
+metadata:
+  name: worker-1
+spec:
+  template:
+    spec:
+      joinConfiguration:
+        nodeRegistration:
+          name: '{{ ds.meta_data.name }}'
+          kubeletExtraArgs:
+            node-labels: 'metal3.io/uuid={{ ds.meta_data.uuid }},node-type=worker'
+            provider-id: 'metal3://{{ ds.meta_data.uuid }}'
+            feature-gates: "IPv6DualStack=true"
+      ntp:
+        enabled: true
+        servers:
+          - 135.188.34.124
+          - 135.38.244.16
+          - 135.188.34.84
+      preKubeadmCommands:
+        - echo 'root:r00tme' | chpasswd
+        - echo 'ubuntu:r00tme' | chpasswd
+        - |
+          cat <<EOF | tee /etc/sysctl.d/k8s.conf
+          net.bridge.bridge-nf-call-ip6tables = 1
+          net.bridge.bridge-nf-call-iptables = 1
+          EOF
+        - sysctl --system
+        - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+        - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
+        - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+        - echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list
+        - apt-get update
+        - apt-get install -y
+            docker-ce="$(apt policy docker-ce  | grep 19.03.9 | sort | head -n 1 | tr -s " " | cut -d ' ' -f 2 )"
+            docker-ce-cli="$(apt policy docker-ce-cli  | grep 19.03.9 | sort | head -n 1 | tr -s " " | cut -d ' ' -f 2 )"
+            containerd.io
+        - swapoff -a
+        - apt-get install -y kubelet=1.18.6-00 kubeadm=1.18.6-00
+        - apt-mark hold kubelet kubeadm
+        - systemctl mask ntp
+        - systemctl enable --now systemd-timesyncd
+      users:
+        - name: deployer
+          sshAuthorizedKeys:
+          - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDK5jnOafJwnoN+vp77LgayzLZ7O6tu96cObzwjIEwOowi2KHTk+G4sUXzE4mt2QbPTbyOF45d/omcRZYixrTmYwwtJ9QGPbwWw/qpCRzVo5uV4qbwBd3iRUqXryOmZRCCFac678JXZS9f8AfOP9rHkh2jqhA6dJdtvqYTOpPLtmw8pYjScH/YqBXZObNSFS5PlSPl901UhZH4FNUAuYeR9JGY99wgM+R9XHRRgfBPJzwzvOQ7ZYfvxb+n4TuBr7u7jZtYC+pmG/eOYbIt2/vexO0y/rNomtC+hjDAXZO2VFwHejYW6r+ZPpkNrdr+5U8s0aENGg4BJkVa2n3LwUrZF segorov@node1
+          sudo: ALL=(ALL) NOPASSWD:ALL
diff --git a/manifests/site/test-site/target/workers/kustomization.yaml b/manifests/site/test-site/target/workers/kustomization.yaml
new file mode 100644
index 0000000..ece1a69
--- /dev/null
+++ b/manifests/site/test-site/target/workers/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - nodes
+  - kubeadmconfigtemplate.yaml
+  - metal3machinetemplate.yaml
+  - machinedeployment.yaml
diff --git a/manifests/site/test-site/target/workers/machinedeployment.yaml b/manifests/site/test-site/target/workers/machinedeployment.yaml
new file mode 100644
index 0000000..e9687d8
--- /dev/null
+++ b/manifests/site/test-site/target/workers/machinedeployment.yaml
@@ -0,0 +1,29 @@
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: MachineDeployment
+metadata:
+  name: worker-1
+  labels:
+    cluster.x-k8s.io/cluster-name: target-cluster
+spec:
+  clusterName: target-cluster
+  replicas: 1
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/cluster-name: target-cluster
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/cluster-name: target-cluster
+    spec:
+      clusterName: target-cluster
+      version: v1.18.3
+      bootstrap:
+        configRef:
+          name: worker-1
+          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+          kind: KubeadmConfigTemplate
+      infrastructureRef:
+        name: worker-1
+        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+        kind: Metal3MachineTemplate
+---
diff --git a/manifests/site/test-site/target/workers/metal3machinetemplate.yaml b/manifests/site/test-site/target/workers/metal3machinetemplate.yaml
new file mode 100644
index 0000000..68599b3
--- /dev/null
+++ b/manifests/site/test-site/target/workers/metal3machinetemplate.yaml
@@ -0,0 +1,10 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
+kind: Metal3MachineTemplate
+metadata:
+  name: worker-1
+spec:
+  template:
+    spec:
+      image:
+        url: http://10.23.24.1:8099/target-image.qcow2
+        checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum
diff --git a/manifests/site/test-site/target/workers/nodes/kustomization.yaml b/manifests/site/test-site/target/workers/nodes/kustomization.yaml
new file mode 100644
index 0000000..512dc07
--- /dev/null
+++ b/manifests/site/test-site/target/workers/nodes/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+generators:
+  - ../hostgenerator
+
+commonLabels:
+  airshipit.org/k8s-role: controlplane-host
diff --git a/tools/deployment/02_install_clusterctl.sh b/tools/deployment/02_install_clusterctl.sh
new file mode 100755
index 0000000..1a9d51e
--- /dev/null
+++ b/tools/deployment/02_install_clusterctl.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
+
+cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/02_install_clusterctl.sh
diff --git a/tools/deployment/33_cluster_move_target_node.sh b/tools/deployment/33_cluster_move_target_node.sh
new file mode 100755
index 0000000..dd7686f
--- /dev/null
+++ b/tools/deployment/33_cluster_move_target_node.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
+
+cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/33_cluster_move_target_node.sh
diff --git a/tools/deployment/33_deploy_workload.sh b/tools/deployment/33_deploy_workload.sh
deleted file mode 100755
index c22d7d0..0000000
--- a/tools/deployment/33_deploy_workload.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
-
-cd ${AIRSHIPCTL_PROJECT}
-
-echo "Deploy workload"
-airshipctl config use-context target-cluster-admin@target-cluster
-airshipctl config set-context target-cluster-admin@target-cluster --manifest dummy_manifest
-airshipctl phase apply workload
diff --git a/tools/deployment/34_deploy_worker_node.sh b/tools/deployment/34_deploy_worker_node.sh
new file mode 100755
index 0000000..23b59fb
--- /dev/null
+++ b/tools/deployment/34_deploy_worker_node.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
+
+cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/34_deploy_worker_node.sh
diff --git a/tools/deployment/35_deploy_workload.sh b/tools/deployment/35_deploy_workload.sh
new file mode 100755
index 0000000..50ca47f
--- /dev/null
+++ b/tools/deployment/35_deploy_workload.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
+
+cd ${AIRSHIPCTL_PROJECT}
+./tools/deployment/35_deploy_workload.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 91326be..111fece 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -64,6 +64,7 @@
       site_name: test-site
       gate_scripts:
         - ./tools/deployment/01_install_kubectl.sh
+        - ./tools/deployment/02_install_clusterctl.sh
         - ./tools/deployment/22_test_configs.sh
         - ./tools/deployment/24_build_ephemeral_iso.sh
         - ./tools/deployment/25_deploy_ephemeral_node.sh
@@ -71,7 +72,10 @@
         - ./tools/deployment/30_deploy_controlplane.sh
         - ./tools/deployment/31_deploy_initinfra_target_node.sh
         - ./tools/deployment/32_cluster_init_target_node.sh
-        - ./tools/deployment/33_deploy_workload.sh
+        - ./tools/deployment/33_cluster_move_target_node.sh
+        - ./tools/deployment/34_deploy_worker_node.sh
+        - ./tools/deployment/35_deploy_workload.sh
+
       serve_dir: /srv/iso
       serve_port: 8099
     voting: false