commit 83dff8250aebbef9e2278800ab5fbeeb468791cf
author calvinosanc1 <guillermo.calvino@canonical.com> Mon Jan 04 11:50:09 2021 +0100
committer calvinosanc1 <guillermo.calvino@canonical.com> Tue Jan 05 18:44:50 2021 +0100
tree a0bdb52dd8674eb0fcb6d4bbeaa2035a6d36c8a0
parent 7498c1dfab5ba2a01a532ab8069abbceae5ccd08

Fix 1391: New version of yq snap makes charmed installer to fail
Fix 1394: Use of R9 images

Change-Id: I0e246889e914c93963984b26423ab5620cb65efe
Signed-off-by: calvinosanc1 <guillermo.calvino@canonical.com>

installers/charmed_install.sh

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 4d04a91..7f05e04 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -310,14 +310,14 @@
     sudo snap install jq
     sudo snap install yq
     local HOME=/home/$USER
-    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.user)
-    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.password)
-    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 1)
-    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 2)
+    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.user - )
+    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.password - )
+    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 1)
+    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 2)
     local vca_pubkey=\"$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)\"
     local vca_cloud="lxd-cloud"
     # Get the VCA Certificate
-    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.ca-cert | base64 | tr -d \\n)
+    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.ca-cert - | base64 | tr -d \\n)
 
     # Calculate the default route of this machine
     local DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5}'`