X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Ffull_install_osm.sh;h=99999269b2a23e531c190bad43bbb52262105a61;hb=refs%2Fchanges%2F76%2F9076%2F7;hp=ebccb925a936fbbd1cc7673bda9012a2360c4bb7;hpb=0fead9c123d7caf6d46aadbc4eb10ee2d618affd;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index ebccb925..99999269 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -27,7 +27,6 @@ function usage(){ echo -e " -b tags/v1.1.0 (a specific tag)" echo -e " ..." echo -e " -c deploy osm services using container . Valid values are or . If -c is not used then osm will be deployed using default orchestrator. When used with --uninstall, osm services deployed by the orchestrator will be uninstalled" - echo -e " -n install OSM with Next Gen UI. Valid values are or . If -n is not specified osm will be installed with light-ui. When used with uninstall, osm along with the UI specified will be uninstalled" echo -e " -s or user defined stack name when installed using swarm or namespace when installed using k8s, default is osm" echo -e " -H use specific juju host controller IP" echo -e " -S use VCA/juju secret key" @@ -61,14 +60,15 @@ function usage(){ echo -e " --showopts: print chosen options and exit (only for debugging)" echo -e " -y: do not prompt for confirmation, assumes yes" echo -e " -h / --help: print this help" - echo -e " --charmed: install OSM with charms" - echo -e " --bundle : Specify with which bundle to deploy OSM with charms (--charmed option)" - echo -e " --kubeconfig : Specify with which kubernetes to deploy OSM with charms (--charmed option)" - echo -e " --controller : Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" - echo -e " --lxd-cloud : Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" - echo -e " --lxd-credentials : Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" - echo -e " --microstack: Installs microstack as a vim. (--charmed option)" - echo -e " --tag: Docker image tag" + echo -e " --charmed: Deploy and operate OSM with Charms on k8s" + echo -e " [--bundle ]: Specify with which bundle to deploy OSM with charms (--charmed option)" + echo -e " [--k8s ]: Specify with which kubernetes to deploy OSM with charms (--charmed option)" + echo -e " [--vca ]: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" + echo -e " [--lxd ]: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" + echo -e " [--lxd-cred ]: Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" + echo -e " [--microstack]: Installs microstack as a vim. (--charmed option)" + echo -e " [--ha]: Installs High Availability bundle. (--charmed option)" + echo -e " [--tag]: Docker image tag" } @@ -210,6 +210,7 @@ function uninstall_lightweight() { newgrp docker << EONG docker image rm ${DOCKER_USER}/ro:${OSM_DOCKER_TAG} docker image rm ${DOCKER_USER}/lcm:${OSM_DOCKER_TAG} + docker image rm ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG} docker image rm ${DOCKER_USER}/keystone:${OSM_DOCKER_TAG} docker image rm ${DOCKER_USER}/nbi:${OSM_DOCKER_TAG} docker image rm ${DOCKER_USER}/mon:${OSM_DOCKER_TAG} @@ -217,15 +218,6 @@ function uninstall_lightweight() { docker image rm ${DOCKER_USER}/pla:${OSM_DOCKER_TAG} docker image rm ${DOCKER_USER}/osmclient:${OSM_DOCKER_TAG} EONG - if [ -n "$NGUI" ]; then - newgrp docker << EONG - docker image rm ${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG} -EONG - else - newgrp docker << EONG - docker image rm ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG} -EONG - fi if [ -n "$KUBERNETES" ]; then OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_STACK_NAME}" @@ -259,7 +251,7 @@ function check_install_iptables_persistent(){ #Configure NAT rules, based on the current IP addresses of containers function nat(){ check_install_iptables_persistent - + echo -e "\nConfiguring NAT rules" echo -e " Required root privileges" sudo $OSM_DEVOPS/installers/nat_osm @@ -405,7 +397,7 @@ function install_docker_compose() { function install_juju() { echo "Installing juju" - sudo snap install juju --classic + sudo snap install juju --classic --channel=2.7/stable [[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}" echo "Finished installation of juju" return 0 @@ -520,23 +512,13 @@ function generate_docker_images() { sg docker -c "docker build ${LWTEMPDIR}/LCM -f ${LWTEMPDIR}/LCM/Dockerfile.local -t ${DOCKER_USER}/lcm --no-cache" || FATAL "cannot build LCM docker image" fi - if [ -n "$NGUI" ]; then - if [ -n "$PULL_IMAGES" ]; then - sg docker -c "docker pull ${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}" || FATAL "cannot pull ng-ui docker image" - elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NG-UI ; then - git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/NG-UI - git -C ${LWTEMPDIR}/NG-UI checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/NG-UI -f ${LWTEMPDIR}/NG-UI/docker/Dockerfile -t ${DOCKER_USER}/ng-ui --no-cache" || FATAL "cannot build NG-UI docker image" - fi - else - if [ -n "$PULL_IMAGES" ]; then - sg docker -c "docker pull ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG}" || FATAL "cannot pull light-ui docker image" - elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q LW-UI ; then - git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LW-UI - git -C ${LWTEMPDIR}/LW-UI checkout ${COMMIT_ID} - sg docker -c "docker build ${LWTEMPDIR}/LW-UI -f ${LWTEMPDIR}/LW-UI/docker/Dockerfile -t ${DOCKER_USER}/light-ui --no-cache" || FATAL "cannot build LW-UI docker image" - fi - fi + if [ -n "$PULL_IMAGES" ]; then + sg docker -c "docker pull ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG}" || FATAL "cannot pull light-ui docker image" + elif [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q LW-UI ; then + git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/LW-UI + git -C ${LWTEMPDIR}/LW-UI checkout ${COMMIT_ID} + sg docker -c "docker build ${LWTEMPDIR}/LW-UI -f ${LWTEMPDIR}/LW-UI/docker/Dockerfile -t ${DOCKER_USER}/light-ui --no-cache" || FATAL "cannot build LW-UI docker image" + fi if [ -n "$PULL_IMAGES" ]; then sg docker -c "docker pull ${DOCKER_USER}/osmclient:${OSM_DOCKER_TAG}" || FATAL "cannot pull osmclient docker image" @@ -579,15 +561,9 @@ function generate_docker_env_files() { if [ -n "$KUBERNETES" ]; then #Kubernetes resources $WORKDIR_SUDO cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR - [ -n "$NGUI" ] && $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/osm_pods/ng-ui.yaml $OSM_K8S_WORK_DIR/ng-ui.yaml && $WORKDIR_SUDO rm $OSM_K8S_WORK_DIR/light-ui.yaml else - if [ -n "$NGUI" ]; then - # For NG-UI - $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose-ngui.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml - else - # Docker-compose - $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml - fi + # Docker-compose + $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml if [ -n "$INSTALL_PLA" ]; then $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/osm_pla/docker-compose.yaml $OSM_DOCKER_WORK_DIR/osm_pla/docker-compose.yaml fi @@ -831,10 +807,10 @@ function install_helm() { } function parse_yaml() { - osm_services="nbi lcm ro pol mon light-ui ng-ui keystone" + osm_services="nbi lcm ro pol mon light-ui keystone" TAG=$1 for osm in $osm_services; do - $WORKDIR_SUDO sed -i "s/opensourcemano\/$osm:.*/$DOCKER_USER\/$osm:$TAG/g" $OSM_K8S_WORK_DIR/$osm.yaml + $WORKDIR_SUDO sed -i "s/opensourcemano\/$osm:.*/opensourcemano\/$osm:$TAG/g" $OSM_K8S_WORK_DIR/$osm.yaml done } @@ -1250,7 +1226,6 @@ function dump_vars(){ echo "OSM_STACK_NAME=$OSM_STACK_NAME" echo "PULL_IMAGES=$PULL_IMAGES" echo "KUBERNETES=$KUBERNETES" - echo "NGUI=$NGUI" echo "SHOWOPTS=$SHOWOPTS" echo "Install from specific refspec (-b): $COMMIT_ID" } @@ -1293,7 +1268,6 @@ INSTALL_NOLXD="" INSTALL_NODOCKER="" INSTALL_NOJUJU="" KUBERNETES="" -NGUI="" INSTALL_K8S_MONITOR="" INSTALL_NOHOSTCLIENT="" SESSION_ID=`date +%s` @@ -1329,7 +1303,7 @@ POD_NETWORK_CIDR=10.244.0.0/16 K8S_MANIFEST_DIR="/etc/kubernetes/manifests" RE_CHECK='^[a-z0-9]([-a-z0-9]*[a-z0-9])?$' -while getopts ":b:r:c:n:k:u:R:D:o:m:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do +while getopts ":b:r:c:k:u:R:D:o:m:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do case "${o}" in b) COMMIT_ID=${OPTARG} @@ -1345,12 +1319,6 @@ while getopts ":b:r:c:n:k:u:R:D:o:m:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do echo -e "Invalid argument for -i : ' $OPTARG'\n" >&2 usage && exit 1 ;; - n) - [ "${OPTARG}" == "lwui" ] && continue - [ "${OPTARG}" == "ngui" ] && NGUI="y" && continue - echo -e "Invalid argument for -n : ' $OPTARG'\n" >&2 - usage && exit 1 - ;; k) REPOSITORY_KEY="${OPTARG}" REPO_ARGS+=(-k "$REPOSITORY_KEY") @@ -1446,10 +1414,11 @@ while getopts ":b:r:c:n:k:u:R:D:o:m:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do [ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue [ "${OPTARG}" == "charmed" ] && CHARMED="y" && continue [ "${OPTARG}" == "bundle" ] && continue - [ "${OPTARG}" == "kubeconfig" ] && continue - [ "${OPTARG}" == "lxdendpoint" ] && continue - [ "${OPTARG}" == "lxdcert" ] && continue + [ "${OPTARG}" == "k8s" ] && continue + [ "${OPTARG}" == "lxd" ] && continue + [ "${OPTARG}" == "lxd-cred" ] && continue [ "${OPTARG}" == "microstack" ] && continue + [ "${OPTARG}" == "ha" ] && continue [ "${OPTARG}" == "tag" ] && continue [ "${OPTARG}" == "pla" ] && INSTALL_PLA="y" && continue echo -e "Invalid option: '--$OPTARG'\n" >&2 @@ -1488,23 +1457,23 @@ if [ -n "$CHARMED" ]; then /usr/share/osm-devops/installers/charmed_uninstall.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t $DOCKER_TAG "$@" else /usr/share/osm-devops/installers/charmed_install.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D /usr/share/osm-devops -t $DOCKER_TAG "$@" - fi - echo "Your installation is now complete, follow these steps for configuring the osmclient:" - echo - echo "1. Get the NBI IP with the following command:" - echo - echo "juju status --format yaml | yq r - applications.nbi-k8s.address" - echo - echo "2. Create the OSM_HOSTNAME environment variable with the NBI IP" - echo - echo "export OSM_HOSTNAME=" - echo - echo "3. Add the previous command to your .bashrc for other Shell sessions" - echo - echo "export OSM_HOSTNAME= >> ~/.bashrc" - echo - echo "DONE" + echo "Your installation is now complete, follow these steps for configuring the osmclient:" + echo + echo "1. Get the NBI IP with the following command:" + echo + echo NBI_IP='`juju status --format json | jq -rc '"'"'.applications."nbi-k8s".address'"'"'`' + echo + echo "2. Create the OSM_HOSTNAME environment variable with the NBI IP" + echo + echo "export OSM_HOSTNAME=\$NBI_IP" + echo + echo "3. Add the previous command to your .bashrc for other Shell sessions" + echo + echo "echo \"export OSM_HOSTNAME=\$NBI_IP\" >> ~/.bashrc" + echo + echo "DONE" + fi exit 0 fi