Commits on Source (3)
...@@ -24,11 +24,6 @@ function usage(){ ...@@ -24,11 +24,6 @@ function usage(){
echo -e " -R <release>: use specified release for osm binaries (deb packages, lxd images, ...)" echo -e " -R <release>: use specified release for osm binaries (deb packages, lxd images, ...)"
echo -e " -u <repo base>: use specified repository url for osm packages" echo -e " -u <repo base>: use specified repository url for osm packages"
echo -e " -k <repo key>: use specified repository public key url" echo -e " -k <repo key>: use specified repository public key url"
echo -e " -b <refspec>: install OSM from source code using a specific branch (master, v2.0, ...) or tag"
echo -e " -b master (main dev branch)"
echo -e " -b v2.0 (v2.0 branch)"
echo -e " -b tags/v1.1.0 (a specific tag)"
echo -e " ..."
echo -e " -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)" echo -e " -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)"
echo -e " -c <kubernetes engine>: use a specific kubernetes engine (options: kubeadm, k3s, microk8s), default is kubeadm" echo -e " -c <kubernetes engine>: use a specific kubernetes engine (options: kubeadm, k3s, microk8s), default is kubeadm"
echo -e " -s <namespace> namespace when installed using k8s, default is osm" echo -e " -s <namespace> namespace when installed using k8s, default is osm"
...@@ -39,7 +34,6 @@ function usage(){ ...@@ -39,7 +34,6 @@ function usage(){
echo -e " --pla: install the PLA module for placement support" echo -e " --pla: install the PLA module for placement support"
echo -e " --old-sa: install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway" echo -e " --old-sa: install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway"
echo -e " --ng-sa: install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)" echo -e " --ng-sa: install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)"
echo -e " -m <MODULE>: install OSM but only rebuild or pull the specified docker images (NG-UI, NBI, LCM, RO, MON, POL, PLA, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, NONE)"
echo -e " -o <ADDON>: ONLY (un)installs one of the addons (k8s_monitor, ng-sa)" echo -e " -o <ADDON>: ONLY (un)installs one of the addons (k8s_monitor, ng-sa)"
echo -e " -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/" echo -e " -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"
echo -e " -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack" echo -e " -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"
...@@ -60,13 +54,9 @@ function usage(){ ...@@ -60,13 +54,9 @@ function usage(){
echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and confifured)" echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and confifured)"
echo -e " --nodocker: do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)" echo -e " --nodocker: do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)"
echo -e " --nojuju: do not juju, assumes already installed" echo -e " --nojuju: do not juju, assumes already installed"
echo -e " --nodockerbuild:do not build docker images (use existing locally cached images)"
echo -e " --nohostports: do not expose docker ports to host (useful for creating multiple instances of osm on the same host)" echo -e " --nohostports: do not expose docker ports to host (useful for creating multiple instances of osm on the same host)"
echo -e " --nohostclient: do not install the osmclient" echo -e " --nohostclient: do not install the osmclient"
echo -e " --uninstall: uninstall OSM: remove the containers and delete NAT rules" echo -e " --uninstall: uninstall OSM: remove the containers and delete NAT rules"
echo -e " --source: install OSM from source code using the latest stable tag"
echo -e " --develop: (deprecated, use '-b master') install OSM from source code using the master branch"
echo -e " --pullimages: pull/run osm images from docker.io/opensourcemano"
echo -e " --k8s_monitor: install the OSM kubernetes monitoring with prometheus and grafana" echo -e " --k8s_monitor: install the OSM kubernetes monitoring with prometheus and grafana"
echo -e " --volume: create a VM volume when installing to OpenStack" echo -e " --volume: create a VM volume when installing to OpenStack"
echo -e " --showopts: print chosen options and exit (only for debugging)" echo -e " --showopts: print chosen options and exit (only for debugging)"
...@@ -208,55 +198,9 @@ function docker_login() { ...@@ -208,55 +198,9 @@ function docker_login() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
function generate_docker_images() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
echo "Generating docker images"
_build_from=$COMMIT_ID
[ -z "$_build_from" ] && _build_from="latest"
echo "OSM Docker images generated from $_build_from"
LWTEMPDIR="$(mktemp -d -q --tmpdir "installosmlight.XXXXXX")"
trap 'rm -rf "${LWTEMPDIR}"' EXIT
for module in MON POL NBI KEYSTONE RO LCM NG-UI PLA; do
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q ${module} ; then
module_lower=${module,,}
if [ $module == "PLA" -a ! -n "$INSTALL_PLA" ]; then
continue
fi
git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/$module
git -C ${LWTEMPDIR}/${module} checkout ${COMMIT_ID}
sg docker -c "docker build ${LWTEMPDIR}/${module} -f ${LWTEMPDIR}/${module}/docker/Dockerfile -t ${DOCKER_USER}/${module_lower} --no-cache" || FATAL "cannot build ${module} docker image"
fi
done
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q osmclient; then
BUILD_ARGS+=(--build-arg REPOSITORY="$REPOSITORY")
BUILD_ARGS+=(--build-arg RELEASE="$RELEASE")
BUILD_ARGS+=(--build-arg REPOSITORY_KEY="$REPOSITORY_KEY")
BUILD_ARGS+=(--build-arg REPOSITORY_BASE="$REPOSITORY_BASE")
sg docker -c "docker build -t ${DOCKER_USER}/osmclient ${BUILD_ARGS[@]} -f $OSM_DEVOPS/docker/osmclient ."
fi
echo "Finished generation of docker images"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
function cmp_overwrite() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
file1="$1"
file2="$2"
if ! $(cmp "${file1}" "${file2}" >/dev/null 2>&1); then
if [ -f "${file2}" ]; then
ask_user "The file ${file2} already exists. Overwrite (y/N)? " n && cp -b ${file1} ${file2}
else
cp -b ${file1} ${file2}
fi
fi
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
#deploys osm pods and services #deploys osm pods and services
function deploy_osm_services() { function deploy_osm_helm_chart() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
# helm is already installed as part of install_kubeadm_cluster.sh
# Generate helm values to be passed with -f osm-values.yaml # Generate helm values to be passed with -f osm-values.yaml
sudo mkdir -p ${OSM_HELM_WORK_DIR} sudo mkdir -p ${OSM_HELM_WORK_DIR}
if [ -n "${INSTALL_JUJU}" ]; then if [ -n "${INSTALL_JUJU}" ]; then
...@@ -325,7 +269,7 @@ function deploy_charmed_services() { ...@@ -325,7 +269,7 @@ function deploy_charmed_services() {
#deploy mongodb #deploy mongodb
function deploy_mongodb() { function deploy_mongodb() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
MONGO_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}" MONGO_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
[ -n "${DOCKER_REGISTRY_URL}" ] && MONGO_OPTS="${MONGO_OPTS} -r ${DOCKER_REGISTRY_URL}" [ -n "${DOCKER_REGISTRY_URL}" ] && MONGO_OPTS="${MONGO_OPTS} -r ${DOCKER_REGISTRY_URL}"
$OSM_DEVOPS/installers/install_mongodb.sh ${MONGO_OPTS} || \ $OSM_DEVOPS/installers/install_mongodb.sh ${MONGO_OPTS} || \
FATAL_TRACK install_osm_mongodb_service "install_mongodb.sh failed" FATAL_TRACK install_osm_mongodb_service "install_mongodb.sh failed"
...@@ -334,7 +278,7 @@ function deploy_mongodb() { ...@@ -334,7 +278,7 @@ function deploy_mongodb() {
function install_osm_ngsa_service() { function install_osm_ngsa_service() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
NGSA_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}" NGSA_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}"
[ -n "${DOCKER_REGISTRY_URL}" ] && NGSA_OPTS="${NGSA_OPTS} -r ${DOCKER_REGISTRY_URL}" [ -n "${DOCKER_REGISTRY_URL}" ] && NGSA_OPTS="${NGSA_OPTS} -r ${DOCKER_REGISTRY_URL}"
$OSM_DEVOPS/installers/install_ngsa.sh ${NGSA_OPTS} || \ $OSM_DEVOPS/installers/install_ngsa.sh ${NGSA_OPTS} || \
FATAL_TRACK install_osm_ngsa_service "install_ngsa.sh failed" FATAL_TRACK install_osm_ngsa_service "install_ngsa.sh failed"
...@@ -438,6 +382,7 @@ Do you want to proceed with the installation (Y/n)? " y && echo "Cancelled!" && ...@@ -438,6 +382,7 @@ Do you want to proceed with the installation (Y/n)? " y && echo "Cancelled!" &&
} }
function find_devops_folder() { function find_devops_folder() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
if [ -z "$OSM_DEVOPS" ]; then if [ -z "$OSM_DEVOPS" ]; then
if [ -n "$TEST_INSTALLER" ]; then if [ -n "$TEST_INSTALLER" ]; then
echo -e "\nUsing local devops repo for OSM installation" echo -e "\nUsing local devops repo for OSM installation"
...@@ -449,6 +394,49 @@ function find_devops_folder() { ...@@ -449,6 +394,49 @@ function find_devops_folder() {
git clone https://osm.etsi.org/gerrit/osm/devops.git $OSM_DEVOPS git clone https://osm.etsi.org/gerrit/osm/devops.git $OSM_DEVOPS
fi fi
fi fi
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
function install_lxd() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
LXD_INSTALL_OPTS="-D ${OSM_DEVOPS} -i ${OSM_DEFAULT_IF} ${DEBUG_INSTALL}"
[ -n "${OSM_BEHIND_PROXY}" ] && LXD_INSTALL_OPTS="${LXD_INSTALL_OPTS} -P"
$OSM_DEVOPS/installers/install_lxd.sh ${LXD_INSTALL_OPTS} || FATAL_TRACK lxd "install_lxd.sh failed"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
function install_docker_ce() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
[ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}"
[ -n "${OSM_BEHIND_PROXY}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -P"
$OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS} || FATAL_TRACK docker_ce "install_docker_ce.sh failed"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
function install_k8s_cluster() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then
KUBEADM_INSTALL_OPTS="-d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
$OSM_DEVOPS/installers/install_kubeadm_cluster.sh ${KUBEADM_INSTALL_OPTS} || \
FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed"
K8SCLUSTER_ADDONS_INSTALL_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
$OSM_DEVOPS/installers/install_cluster_addons.sh ${K8SCLUSTER_ADDONS_INSTALL_OPTS} || \
FATAL_TRACK k8scluster "install_cluster_addons.sh failed"
fi
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
function deploy_osm() {
deploy_mongodb
track deploy_osm deploy_mongodb_ok
deploy_osm_helm_chart
track deploy_osm deploy_osm_services_k8s_ok
if [ -n "$INSTALL_NGSA" ]; then
# optional NGSA install
install_osm_ngsa_service
track deploy_osm install_osm_ngsa_ok
fi
} }
function install_osm() { function install_osm() {
...@@ -456,7 +444,6 @@ function install_osm() { ...@@ -456,7 +444,6 @@ function install_osm() {
trap ctrl_c INT trap ctrl_c INT
check_osm_behind_proxy check_osm_behind_proxy
check_packages "git wget curl tar snapd" check_packages "git wget curl tar snapd"
if [ -n "${INSTALL_JUJU}" ]; then if [ -n "${INSTALL_JUJU}" ]; then
...@@ -487,11 +474,7 @@ function install_osm() { ...@@ -487,11 +474,7 @@ function install_osm() {
[ -n "$APT_PROXY_URL" ] && configure_apt_proxy $APT_PROXY_URL [ -n "$APT_PROXY_URL" ] && configure_apt_proxy $APT_PROXY_URL
# if lxd is requested, we will install it # if lxd is requested, we will install it
if [ -n "$INSTALL_LXD" ]; then [ -n "$INSTALL_LXD" ] && install_lxd
LXD_INSTALL_OPTS="-D ${OSM_DEVOPS} -i ${OSM_DEFAULT_IF} ${DEBUG_INSTALL}"
[ -n "${OSM_BEHIND_PROXY}" ] && LXD_INSTALL_OPTS="${LXD_INSTALL_OPTS} -P"
$OSM_DEVOPS/installers/install_lxd.sh ${LXD_INSTALL_OPTS} || FATAL_TRACK lxd "install_lxd.sh failed"
fi
track prereq prereqok_ok track prereq prereqok_ok
...@@ -499,10 +482,7 @@ function install_osm() { ...@@ -499,10 +482,7 @@ function install_osm() {
if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then
echo "Kubeadm requires docker, so docker will be installed." echo "Kubeadm requires docker, so docker will be installed."
fi fi
DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}" install_docker_ce
[ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}"
[ -n "${OSM_BEHIND_PROXY}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -P"
$OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS} || FATAL_TRACK docker_ce "install_docker_ce.sh failed"
fi fi
track docker_ce docker_ce_ok track docker_ce docker_ce_ok
...@@ -510,14 +490,7 @@ function install_osm() { ...@@ -510,14 +490,7 @@ function install_osm() {
FATAL_TRACK k8scluster "install_helm_client.sh failed" FATAL_TRACK k8scluster "install_helm_client.sh failed"
track helm_client install_helm_client_ok track helm_client install_helm_client_ok
if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then install_k8s_cluster
KUBEADM_INSTALL_OPTS="-d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
$OSM_DEVOPS/installers/install_kubeadm_cluster.sh ${KUBEADM_INSTALL_OPTS} || \
FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed"
K8SCLUSTER_ADDONS_INSTALL_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
$OSM_DEVOPS/installers/install_cluster_addons.sh ${K8SCLUSTER_ADDONS_INSTALL_OPTS} || \
FATAL_TRACK k8scluster "install_cluster_addons.sh failed"
fi
track k8scluster k8scluster_ok track k8scluster k8scluster_ok
if [ -n "${INSTALL_JUJU}" ]; then if [ -n "${INSTALL_JUJU}" ]; then
...@@ -532,24 +505,17 @@ function install_osm() { ...@@ -532,24 +505,17 @@ function install_osm() {
fi fi
track juju juju_ok track juju juju_ok
# Deploy OSM services # This track is maintained for backwards compatibility
[ -z "$DOCKER_NOBUILD" ] && [ -z "$PULL_IMAGES" ] && generate_docker_images
track docker_images docker_images_ok track docker_images docker_images_ok
deploy_mongodb # Deploy OSM (mongodb, OSM helm chart, NGSA)
track deploy_osm deploy_mongodb_ok deploy_osm
deploy_osm_services
track deploy_osm deploy_osm_services_k8s_ok
if [ -n "$INSTALL_K8S_MONITOR" ]; then if [ -n "$INSTALL_K8S_MONITOR" ]; then
# install OSM MONITORING # install OSM MONITORING
install_k8s_monitoring install_k8s_monitoring
track deploy_osm install_k8s_monitoring_ok track deploy_osm install_k8s_monitoring_ok
fi fi
if [ -n "$INSTALL_NGSA" ]; then
# optional NGSA install
install_osm_ngsa_service
track deploy_osm install_osm_ngsa_ok
fi
[ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient [ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
track osmclient osmclient_ok track osmclient osmclient_ok
...@@ -640,8 +606,7 @@ function arrange_docker_default_network_policy() { ...@@ -640,8 +606,7 @@ function arrange_docker_default_network_policy() {
function install_k8s_monitoring() { function install_k8s_monitoring() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
# install OSM monitoring # install OSM monitoring
sudo chmod +x $OSM_DEVOPS/installers/k8s/*.sh sudo $OSM_DEVOPS/installers/k8s/install_osm_k8s_monitoring.sh -o ${OSM_NAMESPACE} || FATAL_TRACK install_k8s_monitoring "k8s/install_osm_k8s_monitoring.sh failed"
sudo $OSM_DEVOPS/installers/k8s/install_osm_k8s_monitoring.sh || FATAL_TRACK install_k8s_monitoring "k8s/install_osm_k8s_monitoring.sh failed"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
...@@ -649,14 +614,11 @@ function dump_vars(){ ...@@ -649,14 +614,11 @@ function dump_vars(){
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
echo "APT_PROXY_URL=$APT_PROXY_URL" echo "APT_PROXY_URL=$APT_PROXY_URL"
echo "K8S_CLUSTER_ENGINE=$K8S_CLUSTER_ENGINE" echo "K8S_CLUSTER_ENGINE=$K8S_CLUSTER_ENGINE"
echo "DEVELOP=$DEVELOP"
echo "DEBUG_INSTALL=$DEBUG_INSTALL" echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "DOCKER_NOBUILD=$DOCKER_NOBUILD"
echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL" echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL"
echo "DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL" echo "DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL"
echo "DOCKER_USER=$DOCKER_USER" echo "DOCKER_USER=$DOCKER_USER"
echo "INSTALL_CACHELXDIMAGES=$INSTALL_CACHELXDIMAGES" echo "INSTALL_CACHELXDIMAGES=$INSTALL_CACHELXDIMAGES"
echo "INSTALL_FROM_SOURCE=$INSTALL_FROM_SOURCE"
echo "INSTALL_JUJU=$INSTALL_JUJU" echo "INSTALL_JUJU=$INSTALL_JUJU"
echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR" echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR"
echo "INSTALL_LXD=$INSTALL_LXD" echo "INSTALL_LXD=$INSTALL_LXD"
...@@ -689,10 +651,8 @@ function dump_vars(){ ...@@ -689,10 +651,8 @@ function dump_vars(){
echo "REPOSITORY_KEY=$REPOSITORY_KEY" echo "REPOSITORY_KEY=$REPOSITORY_KEY"
echo "SHOWOPTS=$SHOWOPTS" echo "SHOWOPTS=$SHOWOPTS"
echo "TEST_INSTALLER=$TEST_INSTALLER" echo "TEST_INSTALLER=$TEST_INSTALLER"
echo "TO_REBUILD=$TO_REBUILD"
echo "UNINSTALL=$UNINSTALL" echo "UNINSTALL=$UNINSTALL"
echo "UPDATE=$UPDATE" echo "UPDATE=$UPDATE"
echo "Install from specific refspec (-b): $COMMIT_ID"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
...@@ -712,17 +672,14 @@ function ctrl_c() { ...@@ -712,17 +672,14 @@ function ctrl_c() {
} }
UNINSTALL="" UNINSTALL=""
DEVELOP=""
UPDATE="" UPDATE=""
RECONFIGURE="" RECONFIGURE=""
TEST_INSTALLER="" TEST_INSTALLER=""
INSTALL_LXD="" INSTALL_LXD=""
SHOWOPTS="" SHOWOPTS=""
COMMIT_ID=""
ASSUME_YES="" ASSUME_YES=""
APT_PROXY_URL="" APT_PROXY_URL=""
K8S_CLUSTER_ENGINE="kubeadm" K8S_CLUSTER_ENGINE="kubeadm"
INSTALL_FROM_SOURCE=""
DEBUG_INSTALL="" DEBUG_INSTALL=""
RELEASE="testing-daily" RELEASE="testing-daily"
REPOSITORY="testing" REPOSITORY="testing"
...@@ -741,7 +698,6 @@ OPENSTACK_USERDATA_FILE="" ...@@ -741,7 +698,6 @@ OPENSTACK_USERDATA_FILE=""
OPENSTACK_VM_NAME="server-osm" OPENSTACK_VM_NAME="server-osm"
OPENSTACK_PYTHON_VENV="$HOME/.virtual-envs/osm" OPENSTACK_PYTHON_VENV="$HOME/.virtual-envs/osm"
INSTALL_ONLY="" INSTALL_ONLY=""
TO_REBUILD=""
INSTALL_DOCKER="" INSTALL_DOCKER=""
INSTALL_JUJU="" INSTALL_JUJU=""
INSTALL_NOHOSTCLIENT="" INSTALL_NOHOSTCLIENT=""
...@@ -754,7 +710,6 @@ OSM_VCA_CLOUDNAME="localhost" ...@@ -754,7 +710,6 @@ OSM_VCA_CLOUDNAME="localhost"
OSM_VCA_K8S_CLOUDNAME="k8scloud" OSM_VCA_K8S_CLOUDNAME="k8scloud"
OSM_NAMESPACE=osm OSM_NAMESPACE=osm
NO_HOST_PORTS="" NO_HOST_PORTS=""
DOCKER_NOBUILD=""
REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg" REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"
REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/debian" REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/debian"
OSM_WORK_DIR="/etc/osm" OSM_WORK_DIR="/etc/osm"
...@@ -782,15 +737,11 @@ DOCKER_PROXY_URL= ...@@ -782,15 +737,11 @@ DOCKER_PROXY_URL=
MODULE_DOCKER_TAG= MODULE_DOCKER_TAG=
OSM_INSTALLATION_TYPE="Default" OSM_INSTALLATION_TYPE="Default"
while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do while getopts ":a:c:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do
case "${o}" in case "${o}" in
a) a)
APT_PROXY_URL=${OPTARG} APT_PROXY_URL=${OPTARG}
;; ;;
b)
COMMIT_ID=${OPTARG}
PULL_IMAGES=""
;;
c) c)
K8S_CLUSTER_ENGINE=${OPTARG} K8S_CLUSTER_ENGINE=${OPTARG}
[ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ] && continue [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ] && continue
...@@ -841,23 +792,6 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o ...@@ -841,23 +792,6 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
N) N)
OPENSTACK_PUBLIC_NET_NAME="${OPTARG}" OPENSTACK_PUBLIC_NET_NAME="${OPTARG}"
;; ;;
m)
[ "${OPTARG}" == "NG-UI" ] && TO_REBUILD="$TO_REBUILD NG-UI" && continue
[ "${OPTARG}" == "NBI" ] && TO_REBUILD="$TO_REBUILD NBI" && continue
[ "${OPTARG}" == "LCM" ] && TO_REBUILD="$TO_REBUILD LCM" && continue
[ "${OPTARG}" == "RO" ] && TO_REBUILD="$TO_REBUILD RO" && continue
[ "${OPTARG}" == "MON" ] && TO_REBUILD="$TO_REBUILD MON" && continue
[ "${OPTARG}" == "POL" ] && TO_REBUILD="$TO_REBUILD POL" && continue
[ "${OPTARG}" == "PLA" ] && TO_REBUILD="$TO_REBUILD PLA" && continue
[ "${OPTARG}" == "osmclient" ] && TO_REBUILD="$TO_REBUILD osmclient" && continue
[ "${OPTARG}" == "KAFKA" ] && TO_REBUILD="$TO_REBUILD KAFKA" && continue
[ "${OPTARG}" == "MONGO" ] && TO_REBUILD="$TO_REBUILD MONGO" && continue
[ "${OPTARG}" == "PROMETHEUS" ] && TO_REBUILD="$TO_REBUILD PROMETHEUS" && continue
[ "${OPTARG}" == "PROMETHEUS-CADVISOR" ] && TO_REBUILD="$TO_REBUILD PROMETHEUS-CADVISOR" && continue
[ "${OPTARG}" == "KEYSTONE-DB" ] && TO_REBUILD="$TO_REBUILD KEYSTONE-DB" && continue
[ "${OPTARG}" == "GRAFANA" ] && TO_REBUILD="$TO_REBUILD GRAFANA" && continue
[ "${OPTARG}" == "NONE" ] && TO_REBUILD="$TO_REBUILD NONE" && continue
;;
H) H)
OSM_VCA_HOST="${OPTARG}" OSM_VCA_HOST="${OPTARG}"
;; ;;
...@@ -900,9 +834,7 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o ...@@ -900,9 +834,7 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
;; ;;
-) -)
[ "${OPTARG}" == "help" ] && usage && exit 0 [ "${OPTARG}" == "help" ] && usage && exit 0
[ "${OPTARG}" == "source" ] && INSTALL_FROM_SOURCE="y" && PULL_IMAGES="" && continue
[ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="--debug" && continue [ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="--debug" && continue
[ "${OPTARG}" == "develop" ] && DEVELOP="y" && continue
[ "${OPTARG}" == "uninstall" ] && UNINSTALL="y" && continue [ "${OPTARG}" == "uninstall" ] && UNINSTALL="y" && continue
[ "${OPTARG}" == "update" ] && UPDATE="y" && continue [ "${OPTARG}" == "update" ] && UPDATE="y" && continue
[ "${OPTARG}" == "reconfigure" ] && RECONFIGURE="y" && continue [ "${OPTARG}" == "reconfigure" ] && RECONFIGURE="y" && continue
...@@ -916,9 +848,7 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o ...@@ -916,9 +848,7 @@ while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
[ "${OPTARG}" == "nohostports" ] && NO_HOST_PORTS="y" && continue [ "${OPTARG}" == "nohostports" ] && NO_HOST_PORTS="y" && continue
[ "${OPTARG}" == "juju" ] && INSTALL_JUJU="y" && continue [ "${OPTARG}" == "juju" ] && INSTALL_JUJU="y" && continue
[ "${OPTARG}" == "nojuju" ] && INSTALL_JUJU="" && continue [ "${OPTARG}" == "nojuju" ] && INSTALL_JUJU="" && continue
[ "${OPTARG}" == "nodockerbuild" ] && DOCKER_NOBUILD="y" && continue
[ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue [ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue
[ "${OPTARG}" == "pullimages" ] && continue
[ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue [ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue
[ "${OPTARG}" == "charmed" ] && CHARMED="y" && OSM_INSTALLATION_TYPE="Charmed" && continue [ "${OPTARG}" == "charmed" ] && CHARMED="y" && OSM_INSTALLATION_TYPE="Charmed" && continue
[ "${OPTARG}" == "bundle" ] && continue [ "${OPTARG}" == "bundle" ] && continue
...@@ -1008,15 +938,12 @@ elif [ -n "$INSTALL_TO_OPENSTACK" ]; then ...@@ -1008,15 +938,12 @@ elif [ -n "$INSTALL_TO_OPENSTACK" ]; then
exit 0 exit 0
else else
# Community_installer # Community_installer
# Check incompatible options
[ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" != " NONE" ] && echo $TO_REBUILD | grep -q NONE && FATAL "Incompatible option: -m NONE cannot be used with other -m options"
[ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" == " PLA" ] && [ -z "$INSTALL_PLA" ] && FATAL "Incompatible option: -m PLA cannot be used without --pla option"
# Special cases go first # Special cases go first
# if develop, we force master if [ -n "$INSTALL_ONLY" ]; then
[ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master" [ -n "$INSTALL_K8S_MONITOR" ] && install_k8s_monitoring
[ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_K8S_MONITOR" ] && install_k8s_monitoring [ -n "$INSTALL_NGSA" ] && install_osm_ngsa_service
[ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_NGSA" ] && install_osm_ngsa_service echo -e "\nDONE" && exit 0
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 fi
# This is where installation starts # This is where installation starts
install_osm install_osm
echo -e "\nDONE" echo -e "\nDONE"
......
...@@ -29,7 +29,7 @@ function install_mongodb() { ...@@ -29,7 +29,7 @@ function install_mongodb() {
helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo update helm repo update
helm upgrade mongodb-k8s bitnami/mongodb -n osm --create-namespace --install -f ${OSM_HELM_WORK_DIR}/mongodb-values.yaml --version ${MONGODB_HELM_VERSION} --timeout 10m || FATAL_TRACK mongodb "Failed installing mongodb helm chart" helm upgrade mongodb-k8s bitnami/mongodb -n ${OSM_NAMESPACE} --create-namespace --install -f ${OSM_HELM_WORK_DIR}/mongodb-values.yaml --version ${MONGODB_HELM_VERSION} --timeout 10m || FATAL_TRACK mongodb "Failed installing mongodb helm chart"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
...@@ -40,8 +40,9 @@ DOCKER_USER="opensourcemano" ...@@ -40,8 +40,9 @@ DOCKER_USER="opensourcemano"
OSM_DEVOPS="/usr/share/osm-devops" OSM_DEVOPS="/usr/share/osm-devops"
OSM_DOCKER_TAG="testing-daily" OSM_DOCKER_TAG="testing-daily"
OSM_HELM_WORK_DIR="/etc/osm/helm" OSM_HELM_WORK_DIR="/etc/osm/helm"
OSM_NAMESPACE="osm"
while getopts ":D:d:t:r:U:-: " o; do while getopts ":D:d:s:t:r:U:-: " o; do
case "${o}" in case "${o}" in
D) D)
OSM_DEVOPS="${OPTARG}" OSM_DEVOPS="${OPTARG}"
...@@ -49,6 +50,9 @@ while getopts ":D:d:t:r:U:-: " o; do ...@@ -49,6 +50,9 @@ while getopts ":D:d:t:r:U:-: " o; do
d) d)
OSM_HELM_WORK_DIR="${OPTARG}" OSM_HELM_WORK_DIR="${OPTARG}"
;; ;;
s)
OSM_NAMESPACE="${OPTARG}"
;;
t) t)
OSM_DOCKER_TAG="${OPTARG}" OSM_DOCKER_TAG="${OPTARG}"
;; ;;
...@@ -84,5 +88,6 @@ echo "DEBUG_INSTALL=$DEBUG_INSTALL" ...@@ -84,5 +88,6 @@ echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "OSM_DEVOPS=$OSM_DEVOPS" echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
echo "OSM_HELM_WORK_DIR=$OSM_HELM_WORK_DIR" echo "OSM_HELM_WORK_DIR=$OSM_HELM_WORK_DIR"
echo "OSM_NAMESPACE=$OSM_NAMESPACE"
install_mongodb install_mongodb
...@@ -34,7 +34,7 @@ function install_airflow() { ...@@ -34,7 +34,7 @@ function install_airflow() {
helm repo add apache-airflow https://airflow.apache.org helm repo add apache-airflow https://airflow.apache.org
helm repo update helm repo update
helm upgrade airflow apache-airflow/airflow -n osm --create-namespace --install -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION} --timeout 10m || FATAL_TRACK ngsa "Failed installing airflow helm chart" helm upgrade airflow apache-airflow/airflow -n ${OSM_NAMESPACE} --create-namespace --install -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION} --timeout 10m || FATAL_TRACK ngsa "Failed installing airflow helm chart"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
} }
...@@ -45,9 +45,10 @@ DOCKER_USER="opensourcemano" ...@@ -45,9 +45,10 @@ DOCKER_USER="opensourcemano"
OSM_DEVOPS="/usr/share/osm-devops" OSM_DEVOPS="/usr/share/osm-devops"
OSM_DOCKER_TAG="testing-daily" OSM_DOCKER_TAG="testing-daily"
OSM_HELM_WORK_DIR="/etc/osm/helm" OSM_HELM_WORK_DIR="/etc/osm/helm"
OSM_NAMESPACE="osm"
DEFAULT_IP="127.0.0.1" DEFAULT_IP="127.0.0.1"
while getopts ":D:d:i:t:r:U:-: " o; do while getopts ":D:d:i:s:t:r:U:-: " o; do
case "${o}" in case "${o}" in
i) i)
DEFAULT_IP="${OPTARG}" DEFAULT_IP="${OPTARG}"
...@@ -58,6 +59,9 @@ while getopts ":D:d:i:t:r:U:-: " o; do ...@@ -58,6 +59,9 @@ while getopts ":D:d:i:t:r:U:-: " o; do
d) d)
OSM_HELM_WORK_DIR="${OPTARG}" OSM_HELM_WORK_DIR="${OPTARG}"
;; ;;
s)
OSM_NAMESPACE="${OPTARG}"
;;
t) t)
OSM_DOCKER_TAG="${OPTARG}" OSM_DOCKER_TAG="${OPTARG}"
;; ;;
...@@ -94,6 +98,7 @@ echo "DEBUG_INSTALL=$DEBUG_INSTALL" ...@@ -94,6 +98,7 @@ echo "DEBUG_INSTALL=$DEBUG_INSTALL"
echo "OSM_DEVOPS=$OSM_DEVOPS" echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
echo "OSM_HELM_WORK_DIR=$OSM_HELM_WORK_DIR" echo "OSM_HELM_WORK_DIR=$OSM_HELM_WORK_DIR"
echo "OSM_NAMESPACE=$OSM_NAMESPACE"
install_airflow install_airflow
track deploy_osm airflow_ok track deploy_osm airflow_ok
...@@ -28,11 +28,6 @@ function usage(){ ...@@ -28,11 +28,6 @@ function usage(){
echo -e " -R <release>: use specified release for osm binaries (deb packages, lxd images, ...)" echo -e " -R <release>: use specified release for osm binaries (deb packages, lxd images, ...)"
echo -e " -u <repo base>: use specified repository url for osm packages" echo -e " -u <repo base>: use specified repository url for osm packages"
echo -e " -k <repo key>: use specified repository public key url" echo -e " -k <repo key>: use specified repository public key url"
echo -e " -b <refspec>: install OSM from source code using a specific branch (master, v2.0, ...) or tag"
echo -e " -b master (main dev branch)"
echo -e " -b v2.0 (v2.0 branch)"
echo -e " -b tags/v1.1.0 (a specific tag)"
echo -e " ..."
echo -e " -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)" echo -e " -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)"
echo -e " -s <namespace> namespace when installed using k8s, default is osm" echo -e " -s <namespace> namespace when installed using k8s, default is osm"
echo -e " -H <VCA host> use specific juju host controller IP" echo -e " -H <VCA host> use specific juju host controller IP"
...@@ -42,7 +37,6 @@ function usage(){ ...@@ -42,7 +37,6 @@ function usage(){
echo -e " --pla: install the PLA module for placement support" echo -e " --pla: install the PLA module for placement support"
echo -e " --old-sa: install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway" echo -e " --old-sa: install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway"
echo -e " --ng-sa: install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)" echo -e " --ng-sa: install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)"
echo -e " -m <MODULE>: install OSM but only rebuild or pull the specified docker images (NG-UI, NBI, LCM, RO, MON, POL, PLA, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, NONE)"
echo -e " -o <ADDON>: ONLY (un)installs one of the addons (k8s_monitor, ng-sa)" echo -e " -o <ADDON>: ONLY (un)installs one of the addons (k8s_monitor, ng-sa)"
echo -e " -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/" echo -e " -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"
echo -e " -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack" echo -e " -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"
...@@ -63,13 +57,9 @@ function usage(){ ...@@ -63,13 +57,9 @@ function usage(){
echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and confifured)" echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and confifured)"
echo -e " --nodocker: do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)" echo -e " --nodocker: do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)"
echo -e " --nojuju: do not juju, assumes already installed" echo -e " --nojuju: do not juju, assumes already installed"
echo -e " --nodockerbuild:do not build docker images (use existing locally cached images)"
echo -e " --nohostports: do not expose docker ports to host (useful for creating multiple instances of osm on the same host)" echo -e " --nohostports: do not expose docker ports to host (useful for creating multiple instances of osm on the same host)"
echo -e " --nohostclient: do not install the osmclient" echo -e " --nohostclient: do not install the osmclient"
echo -e " --uninstall: uninstall OSM: remove the containers and delete NAT rules" echo -e " --uninstall: uninstall OSM: remove the containers and delete NAT rules"
echo -e " --source: install OSM from source code using the latest stable tag"
echo -e " --develop: (deprecated, use '-b master') install OSM from source code using the master branch"
echo -e " --pullimages: pull/run osm images from docker.io/opensourcemano"
echo -e " --k8s_monitor: install the OSM kubernetes monitoring with prometheus and grafana" echo -e " --k8s_monitor: install the OSM kubernetes monitoring with prometheus and grafana"
echo -e " --volume: create a VM volume when installing to OpenStack" echo -e " --volume: create a VM volume when installing to OpenStack"
echo -e " --showopts: print chosen options and exit (only for debugging)" echo -e " --showopts: print chosen options and exit (only for debugging)"
......
...@@ -37,7 +37,8 @@ function usage(){ ...@@ -37,7 +37,8 @@ function usage(){
echo -e "usage: $0 [OPTIONS]" echo -e "usage: $0 [OPTIONS]"
echo -e "Install OSM Monitoring" echo -e "Install OSM Monitoring"
echo -e " OPTIONS" echo -e " OPTIONS"
echo -e " -n <namespace> : use specified kubernetes namespace - default: monitoring" echo -e " -n <namespace> : namespace to deploy k8s cluster monitoring - default: monitoring"
echo -e " -o <osm_namespace> : namespace where OSM is installed - default: osm"
echo -e " -s <service_type>: service type (ClusterIP|NodePort|LoadBalancer) - default: NodePort" echo -e " -s <service_type>: service type (ClusterIP|NodePort|LoadBalancer) - default: NodePort"
echo -e " --debug : debug script" echo -e " --debug : debug script"
echo -e " --dump : dump arguments and versions" echo -e " --dump : dump arguments and versions"
...@@ -45,11 +46,12 @@ function usage(){ ...@@ -45,11 +46,12 @@ function usage(){
} }
NAMESPACE=monitoring NAMESPACE=monitoring
OSM_NAMESPACE=osm
HELM="" HELM=""
DEBUG="" DEBUG=""
DUMP_VARS="" DUMP_VARS=""
SERVICE_TYPE="" SERVICE_TYPE=""
while getopts ":h-:n:s:" o; do while getopts ":h-:n:o:s:" o; do
case "${o}" in case "${o}" in
h) h)
usage && exit 0 usage && exit 0
...@@ -57,11 +59,12 @@ while getopts ":h-:n:s:" o; do ...@@ -57,11 +59,12 @@ while getopts ":h-:n:s:" o; do
n) n)
NAMESPACE="${OPTARG}" NAMESPACE="${OPTARG}"
;; ;;
o)
OSM_NAMESPACE="${OPTARG}"
;;
s) s)
SERVICE_TYPE="${OPTARG}" SERVICE_TYPE="${OPTARG}"
;; ;;
-) -)
[ "${OPTARG}" == "help" ] && usage && exit 0 [ "${OPTARG}" == "help" ] && usage && exit 0
[ "${OPTARG}" == "debug" ] && DEBUG="y" && continue [ "${OPTARG}" == "debug" ] && DEBUG="y" && continue
...@@ -83,6 +86,7 @@ done ...@@ -83,6 +86,7 @@ done
function dump_vars(){ function dump_vars(){
echo "Args...." echo "Args...."
echo "NAMESPACE=$NAMESPACE" echo "NAMESPACE=$NAMESPACE"
echo "OSM_NAMESPACE=$OSM_NAMESPACE"
echo "SERVICE_TYPE=$SERVICE_TYPE" echo "SERVICE_TYPE=$SERVICE_TYPE"
echo "DEBUG=$DEBUG" echo "DEBUG=$DEBUG"
echo "Versions...." echo "Versions...."
...@@ -202,7 +206,7 @@ kubectl -n $NAMESPACE apply -f $HERE/mongodb-exporter-dashboard.yaml ...@@ -202,7 +206,7 @@ kubectl -n $NAMESPACE apply -f $HERE/mongodb-exporter-dashboard.yaml
# Mysql # Mysql
# exporter # exporter
echo "Creating prometheus-community/prometheus-mysql-exporter" echo "Creating prometheus-community/prometheus-mysql-exporter"
helm install osm-mysql-exporter --namespace $NAMESPACE --version=$V_MYSQL_EXPORTER --set serviceMonitor.enabled=true,serviceMonitor.additionalLabels.release=osm-monitoring,mysql.user="root",mysql.pass=`kubectl -n osm get secret ro-db-secret -o yaml | grep -i -A1 '^data:$' | grep MYSQL_ROOT_PASSWORD | awk '{print $2}' | base64 -d`,mysql.host="mysql.osm",mysql.port="3306",'collectors.info_schema\.tables=true' prometheus-community/prometheus-mysql-exporter helm install osm-mysql-exporter --namespace $NAMESPACE --version=$V_MYSQL_EXPORTER --set serviceMonitor.enabled=true,serviceMonitor.additionalLabels.release=osm-monitoring,mysql.user="root",mysql.pass=`kubectl -n ${OSM_NAMESPACE} get secret ro-db-secret -o yaml | grep -i -A1 '^data:$' | grep MYSQL_ROOT_PASSWORD | awk '{print $2}' | base64 -d`,mysql.host="mysql.osm",mysql.port="3306",'collectors.info_schema\.tables=true' prometheus-community/prometheus-mysql-exporter
#dashboard: #dashboard:
kubectl -n $NAMESPACE apply -f $HERE/mysql-exporter-dashboard.yaml kubectl -n $NAMESPACE apply -f $HERE/mysql-exporter-dashboard.yaml
# Kafka # Kafka
......