summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch8
-rw-r--r--patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch4
-rw-r--r--patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch2
-rw-r--r--patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch4
-rw-r--r--patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch2
5 files changed, 10 insertions, 10 deletions
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
index a59df5ce..5001540b 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -36,17 +36,17 @@ 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
-index 8b59910..3b722ea 100755
+index 7b3bb64..f02fff8 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
-@@ -42,6 +42,7 @@ salt -C 'mas01*' pillar.item\
- salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
+@@ -47,6 +47,7 @@ wait_for "! salt '*' test.ping | fgrep -q 'Not connected'"
+
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
+salt -C 'kvm*' state.sls armband
salt -C 'kvm*' state.sls libvirt
- salt -C '* and not cfg01* and not mas01*' system.reboot
+ salt -C '* and not cfg01* and not mas01*' state.apply salt
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 57ca585..23aaf72 100755
--- a/mcp/config/states/openstack
diff --git a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch
index 0e7eee61..cd959da3 100644
--- a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch
+++ b/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch
@@ -24,14 +24,14 @@ index b841e88..17fbbfc 100644
ram: 4096
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
-index 55ffcae..93e2de0 100644
+index e3d47b0..93e2de0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -51,7 +51,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
-- salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+- salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
+ salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
linux:
diff --git a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index ccd537aa..4e3e1085 100644
--- a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -106,7 +106,7 @@ index 5c33f9e..8b09e76 100644
- - ${_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 7fc45e2..428a74b 100644
+index a7a502f..694fae7 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:
diff --git a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch
index e991bbcc..5a937d1d 100644
--- a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -14,7 +14,7 @@ fi
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 1ace950..b3ed5ec 100755
+index cf7b3b3..2b4e724 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
@@ -27,7 +27,7 @@ index 1ace950..b3ed5ec 100755
# 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 3b722ea..235f0b2 100755
+index f02fff8..21c7afe 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface
diff --git a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch
index 6e3850d7..09be6811 100644
--- a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch
+++ b/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch
@@ -12,7 +12,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 428a74b..7a62d3c 100644
+index 694fae7..0b917aa 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
@@ -43,57 +43,57 @@ parameters: