aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-29 20:11:31 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-29 20:12:48 +0200
commit26be4fb77af34a001f01d0f3a01bbf8bf6040877 (patch)
tree4981a55539c222d849ff6935bcf44efce7d8efed /patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
parent35d4faa69ebc0f48520af4c5ffe7fca78854a68c (diff)
p/fuel: Rebase after wrap of common virtual config
Change-Id: I1fd6e63385cfa158b35fa544e1cbb65b6d858c34 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch')
-rw-r--r--patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
index 42d830e..fea6058 100644
--- a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
+++ b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
@@ -25,28 +25,28 @@ index b841e88..17fbbfc 100644
ram: 4096
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
-index e67a06d..066a6e2 100644
+index 0baebb6..c5a999b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
@@ -54,7 +54,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:
- network:
+ system:
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 8bf43be..acf2b43 100644
+index 62f887d..23f205f 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
@@ -54,7 +54,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:
- network:
+ system: