Merge pull request #972 from bogdando/tripleo

Fix tripleo install for multinode adoption testing

Author: openshift-merge-bot[bot]

.pre-commit-config.yaml

@@ -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

devsetup/scripts/tripleo.sh

@@ -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