From fe651c1283fbdd67bd4482727f5b7298d55df9d8 Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Wed, 23 Jun 2021 10:59:03 +0200 Subject: [COMMON] Revert "[COMMON] Fix a few bashisms" This reverts commit 62178a49cc9e4088019d426636657d9f2980d242. This commit introduced regression on portal db config job which is now unable to start: /usr/local/bin/docker-entrypoint.sh: line 114: syntax error near unexpected token `(' Issue-ID: OOM-1 Signed-off-by: Krzysztof Opasiak Change-Id: I3cb72cd7625b180b364b713fe942d5956736ebef --- docs/master_nfs_node.sh | 4 ++-- docs/openstack-k8s-controlnode.sh | 8 ++++---- docs/openstack-k8s-workernode.sh | 8 ++++---- docs/openstack-nfs-server.sh | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'docs') diff --git a/docs/master_nfs_node.sh b/docs/master_nfs_node.sh index 32574c9f29..4a7a8dbc12 100644 --- a/docs/master_nfs_node.sh +++ b/docs/master_nfs_node.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash usage () { echo "Usage:" @@ -23,7 +23,7 @@ sudo chown nobody:nogroup /dockerdata-nfs/ #Update the /etc/exports NFS_EXP="" for i in $@; do - NFS_EXP="${NFS_EXP}$i(rw,sync,no_root_squash,no_subtree_check) " + NFS_EXP+="$i(rw,sync,no_root_squash,no_subtree_check) " done echo "/dockerdata-nfs "$NFS_EXP | sudo tee -a /etc/exports diff --git a/docs/openstack-k8s-controlnode.sh b/docs/openstack-k8s-controlnode.sh index d1515a7e5f..cd219aa56f 100644 --- a/docs/openstack-k8s-controlnode.sh +++ b/docs/openstack-k8s-controlnode.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash DOCKER_VERSION=18.09.5 @@ -18,10 +18,10 @@ systemctl daemon-reload systemctl restart docker apt-mark hold docker-ce -IP_ADDR=$(ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}') -HOST_NAME=$(hostname) +IP_ADDR=`ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}'` +HOSTNAME=`hostname` -echo "$IP_ADDR $HOST_NAME" >> /etc/hosts +echo "$IP_ADDR $HOSTNAME" >> /etc/hosts docker login -u docker -p docker nexus3.onap.org:10001 diff --git a/docs/openstack-k8s-workernode.sh b/docs/openstack-k8s-workernode.sh index 8b1b9e41ee..3f32d050a9 100644 --- a/docs/openstack-k8s-workernode.sh +++ b/docs/openstack-k8s-workernode.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash DOCKER_VERSION=18.09.5 @@ -18,10 +18,10 @@ systemctl daemon-reload systemctl restart docker apt-mark hold docker-ce -IP_ADDR=$(ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}') -HOST_NAME=$(hostname) +IP_ADDR=`ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}'` +HOSTNAME=`hostname` -echo "$IP_ADDR $HOST_NAME" >> /etc/hosts +echo "$IP_ADDR $HOSTNAME" >> /etc/hosts docker login -u docker -p docker nexus3.onap.org:10001 diff --git a/docs/openstack-nfs-server.sh b/docs/openstack-nfs-server.sh index 395d04f27c..1db04eaff6 100644 --- a/docs/openstack-nfs-server.sh +++ b/docs/openstack-nfs-server.sh @@ -1,11 +1,11 @@ -#!/bin/sh +#!/bin/bash apt-get update -IP_ADDR=$(ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}') -HOST_NAME=$(hostname) +IP_ADDR=`ip address |grep ens|grep inet|awk '{print $2}'| awk -F / '{print $1}'` +HOSTNAME=`hostname` -echo "$IP_ADDR $HOST_NAME" >> /etc/hosts +echo "$IP_ADDR $HOSTNAME" >> /etc/hosts sudo apt-get install make -y -- cgit 1.2.3-korg