Skip to content

Add GROUP variable for chown where different from USER #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 20, 2020
Merged

Add GROUP variable for chown where different from USER #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 02_configure_host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ansible-playbook \
if [ ${NUM_EXTRA_WORKERS} -ne 0 ]; then
ORIG_NODES_FILE="${NODES_FILE}.orig"
cp -f ${NODES_FILE} ${ORIG_NODES_FILE}
sudo chown -R $USER:$USER ${NODES_FILE}
sudo chown -R $USER:$GROUP ${NODES_FILE}
jq "{nodes: .nodes[:$((NUM_MASTERS + NUM_WORKERS))]}" ${ORIG_NODES_FILE} | tee ${NODES_FILE}
jq "{nodes: .nodes[-${NUM_EXTRA_WORKERS}:]}" ${ORIG_NODES_FILE} | tee ${EXTRA_NODES_FILE}
fi
Expand Down
5 changes: 3 additions & 2 deletions common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export MOBY_DISABLE_PIGZ=true

SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
USER=`whoami`
GROUP=`id -gn`

function error () {
echo $@ 1>&2
Expand Down Expand Up @@ -260,7 +261,7 @@ export PERSONAL_PULL_SECRET=${PERSONAL_PULL_SECRET:-$SCRIPTDIR/pull_secret.json}
if [ ! -d "$WORKING_DIR" ]; then
error "Creating Working Dir"
sudo mkdir -p "$WORKING_DIR"
sudo chown "${USER}:${USER}" "$WORKING_DIR"
sudo chown "${USER}:${GROUP}" "$WORKING_DIR"
chmod 755 "$WORKING_DIR"
fi

Expand All @@ -275,7 +276,7 @@ fi
# permissions to be owned by the user running dev-scripts.
if [ ! -f "$IRONIC_IMAGES_DIR/.permissions" ]; then
error "Resetting permissions on Ironic Images Dir..."
sudo chown -R "${USER}:${USER}" "$IRONIC_DATA_DIR"
sudo chown -R "${USER}:${GROUP}" "$IRONIC_DATA_DIR"
sudo find "$IRONIC_DATA_DIR" -type d -print0 | xargs -0 chmod 755
sudo chmod -R +r "$IRONIC_DATA_DIR"
touch "$IRONIC_IMAGES_DIR/.permissions"
Expand Down
2 changes: 1 addition & 1 deletion metal3-dev/local-bmo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ get_creds() {
if oc get -n openshift-machine-api secret ${secret} -o name >/dev/null; then
if [ ! -d ${auth_dir} ]; then
sudo mkdir -p "${auth_dir}"
sudo chown -R $USER:$USER "${auth_dir}/.."
sudo chown -R $USER:$GROUP "${auth_dir}/.."
fi
if [ ! -d ${cred_dir} ]; then
mkdir "${cred_dir}"
Expand Down
2 changes: 1 addition & 1 deletion utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ function setup_local_registry() {
sudo yum install -y httpd-tools

sudo mkdir -pv ${REGISTRY_DIR}/{auth,certs,data}
sudo chown -R $USER:$USER ${REGISTRY_DIR}
sudo chown -R $USER:$GROUP ${REGISTRY_DIR}

pushd $REGISTRY_DIR/certs

Expand Down