Fix 1473 and add vca_model_config_* to lcm charm

[osm/devops.git] / installers / charmed_install.sh

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e196706..b36d582 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -25,8 +25,8 @@ PATH=/snap/bin:${PATH}
 
 MODEL_NAME=osm
 
-OSM_BUNDLE=cs:osm-58
-OSM_HA_BUNDLE=cs:osm-ha-43
+OSM_BUNDLE=cs:osm-60
+OSM_HA_BUNDLE=cs:osm-ha-45
 TAG=testing-daily
 
 function check_arguments(){
@@ -306,7 +306,7 @@ function create_overlay() {
     sudo snap install yq
     local HOME=/home/$USER
     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_secret=$(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)\"
@@ -323,7 +323,7 @@ applications:
   lcm:
     options:
       vca_user: $vca_user
-      vca_password: $vca_password
+      vca_secret: $vca_secret
       vca_host: $vca_host
       vca_port: $vca_port
       vca_pubkey: $vca_pubkey
@@ -333,7 +333,7 @@ applications:
   mon:
     options:
       vca_user: $vca_user
-      vca_password: $vca_password
+      vca_secret: $vca_secret
       vca_host: $vca_host
       vca_cacert: $vca_cacert
 EOF