LXD_VERSION=4.0
JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.29
+JUJU_AGENT_VERSION=2.9.33
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
MICROK8S_VERSION=1.23
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=latest/edge
+CHARMHUB_CHANNEL=latest/beta
unset TAG
function check_arguments(){
generate_password_overlay && secret_overlay="--overlay $PASSWORD_OVERLAY_FILE"
if [ -v BUNDLE ]; then
- juju deploy --trust --channel $CHARMHUB_CHANNEL -m $MODEL_NAME $BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay $secret_overlay
+ juju deploy --trust --channel $CHARMHUB_CHANNEL -m $MODEL_NAME $BUNDLE $images_overlay $extra_overlay $secret_overlay
else
- juju deploy --trust --channel $CHARMHUB_CHANNEL -m $MODEL_NAME $OSM_BUNDLE --overlay ~/.osm/vca-overlay.yaml $images_overlay $extra_overlay $secret_overlay
+ juju deploy --trust --channel $CHARMHUB_CHANNEL -m $MODEL_NAME $OSM_BUNDLE $images_overlay $extra_overlay $secret_overlay
fi
if [ ! -v KUBECFG ]; then
hostport="$(echo ${url/$user@/} | cut -d/ -f1)"
API_SERVER="$(echo $hostport | sed -e 's,:.*,,g')"
fi
+ # Configure VCA Integrator
+ juju config vca \
+ k8s-cloud=microk8s \
+ lxd-cloud=lxd-cloud:lxd-cloud \
+ controllers="`cat ~/.local/share/juju/controllers.yaml`" \
+ accounts="`cat ~/.local/share/juju/accounts.yaml`" \
+ public-key="`cat ~/.local/share/juju/ssh/juju_id_rsa.pub`"
# Expose OSM services
- juju config -m $MODEL_NAME nbi site_url=https://nbi.${API_SERVER}.nip.io
- juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME nbi external-hostname=nbi.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME ng-ui external-hostname=ui.${API_SERVER}.nip.io
juju config -m $MODEL_NAME grafana site_url=https://grafana.${API_SERVER}.nip.io
juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.nip.io
check_osm_deployed
grafana_leader=`juju status -m $MODEL_NAME grafana | grep "*" | cut -d "*" -f 1`
grafana_admin_password=`juju run -m $MODEL_NAME --unit $grafana_leader "echo \\$GF_SECURITY_ADMIN_PASSWORD"`
- juju config -m $MODEL_NAME mon grafana_password=$grafana_admin_password
+ juju config -m $MODEL_NAME mon grafana-password=$grafana_admin_password
check_osm_deployed
echo "OSM with charms deployed"
}
function check_osm_deployed() {
TIME_TO_WAIT=600
start_time="$(date -u +%s)"
- total_service_count=14
+ total_service_count=16
previous_count=0
while true
do
mv /tmp/password-overlay.yaml $PASSWORD_OVERLAY_FILE
}
-function create_overlay() {
- sudo snap install jq
- 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_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)\"
- local vca_cloud="lxd-cloud"
- # Get the VCA Certificate
- 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}'`
-
- # Generate a new overlay.yaml, overriding any existing one
- cat << EOF > /tmp/vca-overlay.yaml
-applications:
- lcm:
- options:
- vca_user: $vca_user
- vca_secret: $vca_secret
- vca_host: $vca_host
- vca_port: $vca_port
- vca_pubkey: $vca_pubkey
- vca_cacert: $vca_cacert
- vca_cloud: $vca_cloud
- vca_k8s_cloud: $K8S_CLOUD_NAME
- mon:
- options:
- vca_user: $vca_user
- vca_secret: $vca_secret
- vca_host: $vca_host
- vca_cacert: $vca_cacert
-EOF
- mv /tmp/vca-overlay.yaml ~/.osm/
- OSM_VCA_HOST=$vca_host
-}
-
function generate_images_overlay(){
echo "applications:" > /tmp/images-overlay.yaml
mkdir -p ~/.osm
install_snaps
bootstrap_k8s_lxd
-create_overlay
if [ -v ONLY_VCA ]; then
HOME=/home/$USER
- vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.user - )
- vca_secret=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.password - )
- vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 1)
- vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 2)
- vca_pubkey=\"$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)\"
- vca_cloud="lxd-cloud"
- vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.ca-cert - | base64 | tr -d \\n)
- hostname=`cat /etc/hostname`
-
- echo "Use the following command to register the installed VCA to your OSM:"
- echo -e " osm vca-add --endpoints $vca_host:$vca_port \\\n --user $vca_user \\\n --secret $vca_secret \\\n --cacert $vca_cacert \\\n --lxd-cloud lxd-cloud \\\n --lxd-credentials lxd-cloud \\\n --k8s-cloud microk8s \\\n --k8s-credentials microk8s\\\n $hostname-vca"
+ k8scloud=microk8s
+ lxdcloud=lxd-cloud:lxd-cloud
+ controllers="`cat $HOME/.local/share/juju/controllers.yaml`"
+ accounts="`cat $HOME/.local/share/juju/accounts.yaml`"
+ publickey="`cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub`"
+ echo "Use the following command to register the installed VCA to your OSM VCA integrator charm"
+ echo -e " juju config vca \\\n k8s-cloud=$k8scloud \\\n lxd-cloud=$lxdcloud \\\n controllers=$controllers \\\n accounts=$accounts \\\n public-key=$publickey"
track deploy_osm deploy_vca_only_ok
else
deploy_charmed_osm
track deploy_osm deploy_osm_services_k8s_ok
install_osmclient
track osmclient osmclient_ok
- export OSM_HOSTNAME=$(juju config -m $MODEL_NAME nbi site_url | sed "s/http.*\?:\/\///"):443
+ export OSM_HOSTNAME=$(juju config -m $MODEL_NAME nbi external-hostname):443
export OSM_PASSWORD=$keystone_admin_password
sleep 10
add_local_k8scluster