Skip to content

Commit

Permalink
integration/run-integration-tests: fix detection of explicit_trust_to…
Browse files Browse the repository at this point in the history
…ken API extension

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
  • Loading branch information
simondeziel committed Jul 11, 2024
1 parent de04a29 commit bb686a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions integration/run-integration-tests
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
# Make sure a client.{crt,key} exist by trying to add a bogus remote
lxc remote add foo 127.0.0.1:1234 2>/dev/null || true

if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
if ! lxc info | grep -qwF explicit_trust_token; then
lxc config set core.trust_password password
fi
lxc config set core.https_address 127.0.0.1
Expand Down Expand Up @@ -64,7 +64,7 @@ for cert in $(comm -13 "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"); do
done
rm -f "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"

if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
if ! lxc info | grep -qwF explicit_trust_token; then
lxc config unset core.trust_password || true
fi
lxc config unset core.https_address || true

0 comments on commit bb686a8

Please sign in to comment.