Merge "Rename cluster-e2etest to cluster-icn"

diff --combined README.md
index 6034c97,da6a544..4681e1d
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -138,6 -138,9 +138,6 @@@ The user will find the network configur
  
  #Ironic Metal3 settings for provisioning network (Net B)
  export IRONIC_INTERFACE="eno2"
 -
 -#Ironic Metal3 setting for IPMI LAN Network (Net C)
 -export IRONIC_IPMI_INTERFACE="eno1"
  ```
  
  #### Running
@@@ -314,7 -317,7 +314,7 @@@ spec
          flux:
              url: https://gerrit.akraino.org/r/icn
              branch: master
-             path: ./deploy/site/cluster-e2etest
+             path: ./deploy/site/cluster-icn
  ```
  
  A brief overview of the values is below. Refer to the machine and

diff --combined deploy/site/pod11/site.yaml
index 1ba4f32,7b423cb..2563b3c
--- 1/deploy/site/pod11/site.yaml
--- 2/deploy/site/pod11/site.yaml
+++ b/deploy/site/pod11/site.yaml
@@@ -110,7 -110,11 +110,7 @@@ spec
              provisioning:
                  macAddress: 00:1e:67:fe:f4:1a
                  type: ipv4_dhcp
 -            private:
 -                macAddress: 00:1e:67:f8:6a:40
 -                type: ipv4
 -                ipAddress: 10.10.112.3/24
 -            storage:
 +            sriov:
                  macAddress: 00:1e:67:f8:6a:41
                  type: ipv4
                  ipAddress: 10.10.113.3/24
@@@ -178,7 -182,11 +178,7 @@@ spec
              provisioning:
                  macAddress: 00:1e:67:f1:5b:91
                  type: ipv4_dhcp
 -            private:
 -                macAddress: 00:1e:67:f8:69:80
 -                type: ipv4
 -                ipAddress: 10.10.112.4/24
 -            storage:
 +            sriov:
                  macAddress: 00:1e:67:f8:69:81
                  type: ipv4
                  ipAddress: 10.10.113.4/24
@@@ -217,7 -225,7 +217,7 @@@ sops
  apiVersion: helm.toolkit.fluxcd.io/v2beta1
  kind: HelmRelease
  metadata:
-     name: cluster-e2etest
+     name: cluster-icn
      namespace: metal3
  spec:
      interval: 5m
@@@ -229,7 -237,7 +229,7 @@@
                  name: icn
              interval: 1m
      values:
-         clusterName: e2etest
+         clusterName: icn
          clusterLabels:
              site: pod11
          controlPlaneEndpoint: 10.10.110.23
@@@ -245,7 -253,7 +245,7 @@@
          flux:
              url: https://gerrit.akraino.org/r/icn
              branch: master
-             path: ./deploy/site/cluster-e2etest
+             path: ./deploy/site/cluster-icn
  sops:
      kms: []
      gcp_kms: []