X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=b36d582dacf83f0abe06fdada6f8fa9a32a99c9b;hb=021b307297a6ab8dfe9ee3af03154989bcd9e0e8;hp=e196706137eaa29a334f8674a4531cfb2f14e673;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index e1967061..b36d582d 100755 --- 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