From: madavi <jm00553988@techmahindra.com>
Date: Wed, 23 Oct 2019 09:11:22 +0000 (+0200)
Subject: Merge "Native charm support"
X-Git-Tag: v7.0.0rc1~52
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=6859ba91b36d07fc77afcb148fdad12522cf2acc;hp=-c

Merge "Native charm support"
---

6859ba91b36d07fc77afcb148fdad12522cf2acc
diff --combined installers/full_install_osm.sh
index 7fb9587e,109333ed..e564cfb2
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -31,6 -31,7 +31,7 @@@ function usage()
      echo -e "     -S <VCA secret> use VCA/juju secret key"
      echo -e "     -P <VCA pubkey> use VCA/juju public key file"
      echo -e "     -C <VCA cacert> use VCA/juju CA certificate file"
+     echo -e "     -A <VCA apiproxy> use VCA/juju API proxy"
      echo -e "     --vimemu:       additionally deploy the VIM emulator as a docker container"
      echo -e "     --elk_stack:    additionally deploy an ELK docker stack for event logging"
      echo -e "     --pm_stack:     additionally deploy a Prometheus+Grafana stack for performance monitoring (PM)"
@@@ -644,6 -645,13 +645,13 @@@ function juju_createcontroller() 
      [ $(juju controllers | awk "/^${OSM_STACK_NAME}[\*| ]/{print $1}"|wc -l) -eq 1 ] || FATAL "Juju installation failed"
  }
  
+ function juju_createproxy() {
+     if ! sudo iptables -t nat -C PREROUTING -p tcp -m tcp --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST; then
+         sudo iptables -t nat -A PREROUTING -p tcp -m tcp --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST
+         sudo netfilter-persistent save
+     fi
+ }
+ 
  function generate_docker_images() {
      echo "Pulling and generating docker images"
      _build_from=$COMMIT_ID
@@@ -747,26 -755,15 +755,26 @@@ function cmp_overwrite() 
      fi
  }
  
 -function generate_config_log_folders() {
 -    echo "Generating config and log folders"
 -    $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml
 -    $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/prometheus.yml $OSM_DOCKER_WORK_DIR/prometheus.yml
 -    echo "Finished generation of config and log folders"
 -}
  
  function generate_docker_env_files() {
 +    echo "Doing a backup of existing env files"
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/keystone-db.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/keystone.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/lcm.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/lwui.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/mon.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/nbi.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/pol.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/ro-db.env{,~}
 +    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/ro.env{,~}
 +
      echo "Generating docker env files"
 +    # Docker-compose
 +    $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml
 +
 +    # Prometheus
 +    $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/prometheus.yml $OSM_DOCKER_WORK_DIR/prometheus.yml
 +
      # LCM
      if [ ! -f $OSM_DOCKER_WORK_DIR/lcm.env ]; then
          echo "OSMLCM_DATABASE_COMMONKEY=${OSM_DATABASE_COMMONKEY}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
@@@ -796,6 -793,12 +804,12 @@@
      #    $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_CACERT.*|OSMLCM_VCA_CACERT=\"${OSM_VCA_CACERT}\"|g" $OSM_DOCKER_WORK_DIR/lcm.env
      #fi
  
+     if ! grep -Fq "OSMLCM_VCA_APIPROXY" $OSM_DOCKER_WORK_DIR/lcm.env; then
+         echo "OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+     else
+         $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_APIPROXY.*|OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}|g" $OSM_DOCKER_WORK_DIR/lcm.env
+     fi
+ 
      # RO
      MYSQL_ROOT_PASSWORD=$(generate_secret)
      if [ ! -f $OSM_DOCKER_WORK_DIR/ro-db.env ]; then
@@@ -1046,6 -1049,12 +1060,12 @@@ function install_lightweight() 
  	#OSM_VCA_CACERT=$(juju controllers --format json | jq -r '.controllers["osm"]["ca-cert"]' | grep -v "\-\-\-\-\-.*CERTIFICATE\-\-\-\-\-")
      #    [ -z "$OSM_VCA_CACERT" ] && FATAL "Cannot obtain juju CA certificate"
      #fi
+     if [ -z "$OSM_VCA_APIPROXY" ]; then
+         OSM_VCA_APIPROXY=$DEFAULT_IP
+         [ -z "$OSM_VCA_APIPROXY" ] && FATAL "Cannot obtain juju api proxy"
+     fi
+     juju_createproxy
+ 
      if [ -z "$OSM_DATABASE_COMMONKEY" ]; then
          OSM_DATABASE_COMMONKEY=$(generate_secret)
          [ -z "OSM_DATABASE_COMMONKEY" ] && FATAL "Cannot generate common db secret"
@@@ -1060,6 -1069,7 +1080,6 @@@
      [ -z "$DOCKER_NOBUILD" ] && generate_docker_images
      track docker_build
      generate_docker_env_files
 -    generate_config_log_folders
  
      # remove old stack
      remove_stack $OSM_STACK_NAME
@@@ -1215,7 -1225,7 +1235,7 @@@ OSM_DATABASE_COMMONKEY
  ELASTIC_VERSION=6.4.2
  ELASTIC_CURATOR_VERSION=5.5.4
  
- while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:U:P:" o; do
+ while getopts ":hy-:b:r:k:u:R:l:p:D:o:m:H:S:s:w:t:U:P:A:" o; do
      case "${o}" in
          h)
              usage && exit 0
@@@ -1264,6 -1274,9 +1284,9 @@@
          P)
              OSM_VCA_PUBKEY=$(cat ${OPTARG})
              ;;
+         A)
+             OSM_VCA_APIPROXY="${OPTARG}"
+             ;;
          w)
              # when specifying workdir, do not use sudo for access
              WORKDIR_SUDO=