Change-Id: Ia5bab57d6081790ac431eab9c9b5abfb2b9cd853
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index e470cea..018eb54 100755
+index acee8c0..f0de58d 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -48,6 +48,7 @@ wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
+@@ -48,6 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
- - ${_param:deploy_nic}.300
+ - ${_param:trunk_nic}.2183
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
- - ${_param:deploy_nic}.300
+ - ${_param:trunk_nic}.2183
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index b2813f9..c67bc3e 100644
+index d193469..73215ee 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -4,10 +4,10 @@ classes:
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -4,10 +4,10 @@ classes:
++{{endif}}
++{% endraw %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
++{{endif}}
++{% endraw %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index acacb47..8bc328a 100644
+index 1a651cf..c66ecb0 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -4,3 +4,4 @@
- /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch
- /usr/share/salt-formulas/env: 0005-maas-vlan-DHCP-enable-on-fabric-2.patch
- /usr/share/salt-formulas/env: 0006-linux.network.interface-noifupdown-support.patch
+@@ -5,3 +5,4 @@
+ /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
+ /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
+ /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
# Variables below are disabled for now, to be re-introduced or removed later
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
# Variables below are disabled for now, to be re-introduced or removed later
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 018eb54..2dc3845 100755
+index f0de58d..4b306af 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index c67bc3e..60a9459 100644
+index 73215ee..26115fe 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-@@ -44,57 +44,57 @@ parameters:
+@@ -48,57 +48,57 @@ parameters:
machines:
kvm01:
interface:
machines:
kvm01:
interface: