Skip to content
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

Fix tripleo install for multinode adoption testing #972

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −4
Open

Fix tripleo install for multinode adoption testing #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce0c92
Fix home user reference in tripleo install
bogdando Dec 12, 2024
eed2158
Fix ContainerImageRegistryCredentials for tripleo
bogdando Dec 12, 2024
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 .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ repos:
rev: 2.1.1
hooks:
- id: bashate
entry: bashate --error . --ignore=E006,E040,E043
entry: bashate --error . --ignore=E006,E040,E043,E003
6 changes: 3 additions & 3 deletions devsetup/scripts/tripleo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,17 @@ if [ ! -f \$HOME/containers-prepare-parameters.yaml ]; then
--output-env-file \$HOME/containers-prepare-parameters.yaml \${login_args}
# Adoption requires Ceph 7 (Reef) as a requirement. Instead of performing a Ceph
# upgrade from 6 (the default) to 7, let's try to deploy 7 in greenfield
sed -i "s|rhceph-6-rhel9|rhceph-7-rhel9|" $HOME/containers-prepare-parameters.yaml
sed -i "s|rhceph-6-rhel9|rhceph-7-rhel9|" \$HOME/containers-prepare-parameters.yaml
else
echo "Using existing containers-prepare-parameters.yaml"
fi

if [ "\$RH_REGISTRY_USER" ] && [ -n "\$RH_REGISTRY_PWD" ]; then
grep -q ContainerImageRegistryCredentials \$HOME/containers-prepare-parameters.yaml || \
cat >> \$HOME/containers-prepare-parameters.yaml <<__EOF__
ContainerImageRegistryCredentials:
ContainerImageRegistryCredentials:
registry.redhat.io:
\${RH_REGISTRY_USER}: \$RH_REGISTRY_PWD
'\${RH_REGISTRY_USER}': \$RH_REGISTRY_PWD
__EOF__
fi
set -x
Expand Down