X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=f19b2992a6bf406e77040eca7a38d902d5ad3c43;hb=e63d60268c9ae3f07851d48eb3f8c9cd96ce23ad;hp=230a79386249d73d2a0d7dad9781832ff1279d6d;hpb=79d9e042c04dbefdd62919b04829a014b0f0e268;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 230a7938..f19b2992 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -412,18 +412,18 @@ function install_docker_ce() {
         echo "Configuring docker proxy ..."
         if [ -f /etc/docker/daemon.json ]; then
             if grep -q registry-mirrors /etc/docker/daemon.json; then
-                sudo sed -Ei 's/("registry-mirrors".*\[)(.*)\]/\1\2, \"'"${DOCKER_PROXY_URL}"'\"\]/' /etc/docker/daemon.json
+                sudo sed -i "s|registry-mirrors.*|registry-mirrors\": [\"${DOCKER_PROXY_URL}\"] |" /etc/docker/daemon.json
             else
-                sudo sed -i 's/{/{\n  "registry-mirrors": [\"'"${DOCKER_PROXY_URL}"'\"]",/' /etc/docker/daemon.json
+                sudo sed -i "s|{|{\n  \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"],|" /etc/docker/daemon.json
             fi
         else
-            sudo cat << EOF > /etc/docker/daemon.json
+            sudo bash -c "cat << EOF > /etc/docker/daemon.json
 {
-  "registry-mirrors": ["${DOCKER_PROXY_URL}"]
+  \"registry-mirrors\": [\"${DOCKER_PROXY_URL}\"]
 }
-EOF
+EOF"
         fi
-	sudo systemctl daemon-reload
+        sudo systemctl daemon-reload
         sudo service docker restart
         echo "... restarted Docker service again"
     fi
@@ -781,6 +781,7 @@ function generate_docker_env_files() {
 
     # MON
     if [ ! -f $OSM_DOCKER_WORK_DIR/mon.env ]; then
+        echo "OSMMON_KEYSTONE_SERVICE_PASSWORD=${SERVICE_PASSWORD}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/mon.env
         echo "OSMMON_DATABASE_COMMONKEY=${OSM_DATABASE_COMMONKEY}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/mon.env
         echo "OSMMON_SQL_DATABASE_URI=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/mon" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/mon.env
     fi
@@ -837,6 +838,7 @@ function install_kube() {
     sudo apt-get update
     echo "Installing Kubernetes Packages ..."
     sudo apt-get install -y kubelet=1.15.0-00 kubeadm=1.15.0-00 kubectl=1.15.0-00
+    sudo apt-mark hold kubelet kubeadm kubectl
 }
 
 #initializes kubernetes control plane
@@ -962,7 +964,7 @@ function install_helm() {
         kubectl --namespace kube-system create serviceaccount tiller
         kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
         # HELM initialization
-        helm init --service-account tiller
+        helm init --stable-repo-url https://charts.helm.sh/stable --service-account tiller
 
         # Wait for Tiller to be up and running. If timeout expires, continue installing
         tiller_timeout=120;
@@ -1422,7 +1424,7 @@ function install_to_openstack() {
     fi
 
     # Install Pip for Python3
-    $WORKDIR_SUDO apt install -y python3-pip
+    $WORKDIR_SUDO apt install -y python3-pip python3-venv
     $WORKDIR_SUDO -H LC_ALL=C python3 -m pip install -U pip
 
     # Create a venv to avoid conflicts with the host installation
@@ -1430,9 +1432,9 @@ function install_to_openstack() {
 
     source $OPENSTACK_PYTHON_VENV/bin/activate
 
-    # Install Ansible, OpenStack client and SDK
+    # Install Ansible, OpenStack client and SDK, latest openstack version supported is Train
     python -m pip install -U wheel
-    python -m pip install -U python-openstackclient "openstacksdk>=0.12.0,<1" "ansible>=2.10,<2.11"
+    python -m pip install -U "python-openstackclient<=4.0.2" "openstacksdk>=0.12.0,<=0.36.2" "ansible>=2.10,<2.11"
 
     # Install the Openstack cloud module (ansible>=2.10)
     ansible-galaxy collection install openstack.cloud
@@ -1548,7 +1550,7 @@ function dump_vars(){
     echo "NO_HOST_PORTS=$NO_HOST_PORTS"
     echo "DOCKER_NOBUILD=$DOCKER_NOBUILD"
     echo "WORKDIR_SUDO=$WORKDIR_SUDO"
-    echo "OSM_WORK_DIR=$OSM_STACK_NAME"
+    echo "OSM_WORK_DIR=$OSM_WORK_DIR"
     echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
     echo "DOCKER_USER=$DOCKER_USER"
     echo "OSM_STACK_NAME=$OSM_STACK_NAME"
@@ -1931,5 +1933,3 @@ export OSM_USE_LOCAL_DEVOPS=true
 wget -q -O- https://osm-download.etsi.org/ftp/osm-9.0-nine/README2.txt &> /dev/null
 track end
 echo -e "\nDONE"
-
-