diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-14 21:56:28 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-14 22:56:23 +0100 |
| commit | 5312ef6a151a141776856e649a0e7d610b0ad626 (patch) | |
| tree | a9e21070057ac9105e1eafd60e9f0cc0a6f39634 /patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | |
| parent | b54a402f6e089aea752987d5139b9030fca7bbc6 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 21 |
1 files changed, 11 insertions, 10 deletions
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 <Charalampos.Kominos@enea.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> --- 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 |