From 5312ef6a151a141776856e649a0e7d610b0ad626 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 14 Dec 2017 21:56:28 +0100 Subject: p/fuel: Bring back glusterfs PPA arch patch Fuel@OPNFV bumped glusterfs to 3.13 via glusterfs PPA, so bring back our linux.system.repo.glusterfs patch, enabling arm64. While at it, paralellize the addition of opnfv user on VCP nodes. Change-Id: Ic260c54bed05902fa6e8569ab368d0226850f297 Signed-off-by: Alexandru Avadanii --- .../0012-Add-opnfv-user-to-the-deployment.patch | 21 ++++++++-------- ...inux.system.repo.glusterfs-Add-arm64-arch.patch | 29 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index 55ca1828..cc43fd90 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -15,10 +15,10 @@ Signed-off-by: Charalampos Kominos Signed-off-by: Guillermo Herrero --- mcp/config/states/baremetal_init | 1 + - mcp/config/states/virtual_control_plane | 1 + + mcp/config/states/virtual_control_plane | 2 ++ mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml | 4 ++++ mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ - 4 files changed, 13 insertions(+) + 4 files changed, 14 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init @@ -34,17 +34,18 @@ index 7c30515..ea4d23c 100755 salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 8c02d68..f32ebec 100755 +index 8c02d68..7feb541 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -45,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do - rc=0 - for node in $vcp_nodes; do - salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; -+ salt -C "$node" state.apply opnfv.adduser - done - sleep 5 +@@ -50,6 +50,8 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do ((attempt+=1)) + done + ++wait_for 5 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser | " \ ++ "tee /dev/stderr | grep -Fq 'Not connected'" + wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" + wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt" + wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \ diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml index f09ee5d..39d550a 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch b/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch new file mode 100644 index 00000000..65578721 --- /dev/null +++ b/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch @@ -0,0 +1,29 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii +Date: Sun, 26 Nov 2017 17:55:13 +0100 +Subject: [PATCH] linux.system.repo.glusterfs: Add arm64 arch + +Signed-off-by: Alexandru Avadanii +--- + linux/system/repo/glusterfs.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml +index fb331f0..ffad938 100644 +--- a/linux/system/repo/glusterfs.yml ++++ b/linux/system/repo/glusterfs.yml +@@ -6,6 +6,6 @@ parameters: + repo: + glusterfs-ppa: + source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" +- architectures: amd64 ++ architectures: amd64,arm64 + key_id: 3FE869A9 + key_server: keyserver.ubuntu.com -- cgit 1.2.3-korg