From 2da79800d8ee9bc4210740255a42f7ec7a65c072 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 28 Aug 2017 19:45:08 +0200 Subject: p/fuel: Rebase for os cacert While rebasing, drop batch apply of linux.network state for VCP nodes, as it does not fix the underlying problem and only introduces extra delay. Reverts commits: 4f1bfdd Change-Id: I365b029aa2855334e295907cdde623b1717fc69a Signed-off-by: Alexandru Avadanii --- .../0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch') 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 26b0dc33..42d830e1 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,27 +25,27 @@ 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 5862ddb..2374dee 100644 +index e67a06d..066a6e2 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 -@@ -51,7 +51,7 @@ parameters: +@@ -54,7 +54,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 -- 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-amd64-disk1.img + 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: 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 e3d47b0..93e2de0 100644 +index 8bf43be..acf2b43 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: +@@ -54,7 +54,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 -- 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-amd64-disk1.img + 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: -- cgit 1.2.3-korg