# set -eux
-LXD_VERSION=4.0
+LXD_VERSION=5.0
JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.29
+JUJU_AGENT_VERSION=2.9.34
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
MICROK8S_VERSION=1.23
PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
PATH=/snap/bin:${PATH}
OSM_DEVOPS="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. &> /dev/null && pwd )"
+INSTALL_PLA=""
+PLA_OVERLAY_FILE=~/.osm/pla-overlay.yaml
+
if [ -f ${OSM_DEVOPS}/common/all_funcs ] ; then
source ${OSM_DEVOPS}/common/all_funcs
else
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=latest/edge
+CHARMHUB_CHANNEL=latest/beta
unset TAG
function check_arguments(){
--tag) TAG="$2" ;;
--registry) REGISTRY_INFO="$2" ;;
--only-vca) ONLY_VCA=y ;;
+ --pla) INSTALL_PLA=y ;;
esac
shift
done
sudo sysctl --system
# Install LXD snap
sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
- sudo snap install lxd --channel $LXD_VERSION/stable
+ snap info lxd | grep installed > /dev/null
+ if [ $? -eq 0 ]; then
+ sudo snap refresh lxd --channel $LXD_VERSION/stable
+ else
+ sudo snap install lxd --channel $LXD_VERSION/stable
+ fi
# Configure LXD
sudo usermod -a -G lxd `whoami`
cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
ssl-hostname-verification: false
EOF
openssl req -nodes -new -x509 -keyout ~/.osm/client.key -out ~/.osm/client.crt -days 365 -subj "/C=FR/ST=Nice/L=Nice/O=ETSI/OU=OSM/CN=osm.etsi.org"
- local server_cert=`cat /var/snap/lxd/common/lxd/server.crt | sed 's/^/ /'`
- local client_cert=`cat ~/.osm/client.crt | sed 's/^/ /'`
- local client_key=`cat ~/.osm/client.key | sed 's/^/ /'`
-
cat << EOF > $LXD_CREDENTIALS
credentials:
lxd-cloud:
lxd-cloud:
auth-type: certificate
- server-cert: |
-$server_cert
- client-cert: |
-$client_cert
- client-key: |
-$client_key
+ server-cert: /var/snap/lxd/common/lxd/server.crt
+ client-cert: ~/.osm/client.crt
+ client-key: ~/.osm/client.key
EOF
lxc config trust add local: ~/.osm/client.crt
fi
generate_password_overlay && secret_overlay="--overlay $PASSWORD_OVERLAY_FILE"
+ [ -n "$INSTALL_PLA" ] && create_pla_overlay && pla_overlay="--overlay $PLA_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 $pla_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 $pla_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=15
+ [ -n "$INSTALL_PLA" ] && total_service_count=$((total_service_count + 1))
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
+function create_pla_overlay(){
+ echo "Creating PLA Overlay"
+ [ $BUNDLE == $OSM_HA_BUNDLE ] && scale=3 || scale=1
+ cat << EOF > /tmp/pla-overlay.yaml
applications:
- lcm:
+ pla:
+ charm: osm-pla
+ channel: latest/stable
+ scale: $scale
+ series: kubernetes
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
+ log_level: DEBUG
+ resources:
+ image: opensourcemano/pla:testing-daily
+relations:
+ - - pla:kafka
+ - kafka:kafka
+ - - pla:mongodb
+ - mongodb:database
EOF
- mv /tmp/vca-overlay.yaml ~/.osm/
- OSM_VCA_HOST=$vca_host
+ mv /tmp/pla-overlay.yaml $PLA_OVERLAY_FILE
}
function generate_images_overlay(){
echo "applications:" > /tmp/images-overlay.yaml
- charms_with_resources="nbi lcm mon pol ng-ui ro pla"
+ charms_with_resources="nbi lcm mon pol ng-ui ro"
+ [ -n "$INSTALL_PLA" ] && charms_with_resources+=" pla"
for charm in $charms_with_resources; do
cat << EOF > /tmp/${charm}_registry.yaml
registrypath: ${REGISTRY_URL}opensourcemano/${charm}:$TAG
cat << EOF >> /tmp/images-overlay.yaml
${charm}:
resources:
- image: /tmp/${charm}_registry.yaml
+ ${charm}-image: /tmp/${charm}_registry.yaml
EOF
done
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
projects / osm / devops.git / blobdiff