From c993457d9b2a580db9dde2d112ab754a8aaa6c7f Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Sat, 12 May 2018 05:27:56 -0400
Subject: Pull images from csv file

It has been included another method for retrieving OOM images. This
function uses a cvs file to get the information to previously loads
the Docker registry for Helm Charts deployment.

Change-Id: I2e6d154cd7911d65b44592f9cf512180bb05bef6
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-478
---
 lib/oom | 63 +++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 18 deletions(-)

(limited to 'lib/oom')

diff --git a/lib/oom b/lib/oom
index 91df0a9..ea0bae0 100755
--- a/lib/oom
+++ b/lib/oom
@@ -3,9 +3,24 @@
 source /var/onap/functions
 
 oom_delay=30
+k8s_deployment_tool="kubespray"
 
 # _pull_images_from_yaml() - Function that parses a yaml file and pull their images
 function _pull_images_from_yaml_file {
+    if [[ "$clone_repo" != "True" ]]; then
+        clone_repos "oom"
+    fi
+
+    docker_openecomp_login
+    for values_file in `find ${src_folders[oom]}/kubernetes -name values.yaml -type f`; do
+        _parse_yaml_file $values_file
+    done
+    docker logout
+    wait_docker_pull
+}
+
+# _parse_yaml_file() - Fuction that parses the OOM Charts files
+function _parse_yaml_file {
     local values_file=$1
     local prefix=$2
     local s='[[:space:]]*'
@@ -41,33 +56,38 @@ for (i in vname) {
     done
 }
 
+# _pull_images_from_csv_file() - Function that parses a csv file to pull their images
+function _pull_images_from_csv_file {
+    local filename=docker-manifest.csv
+
+    wget ${git_url}/integration/plain/version-manifest/src/main/resources/$filename
+
+    install_docker
+    for line in $(tail -n +2 $filename); do
+        image=${line%,*}
+        pull_$(echo $image | cut -d / -f 1)_image ${image#*/} ${line#*,} &
+    done
+    rm $filename
+    wait_docker_pull
+}
+
 # get_oom_images() - Function that retrieves ONAP images from official hub
 function get_oom_images {
+    local single_source_of_truth=${1:-"csv"}
+
     if [[ "$build_image" == "True" ]]; then
         for project in aai appc dcae dmaap mr msb mso multicloud policy portal robot sdc sdnc vfc vid; do
             source /var/onap/$project
             get_${project}_images
         done
     else
-        if [[ "$clone_repo" != "True" ]]; then
-            clone_repos "oom"
-        fi
-
-        docker_openecomp_login
-        for values_file in `find ${src_folders[oom]}/kubernetes -name values.yaml -type f`; do
-            _pull_images_from_yaml_file $values_file
-        done
-        docker logout
-        wait_docker_pull
+        _pull_images_from_${single_source_of_truth}_file
     fi
 }
 
 # install_oom() - Function that clones OOM and deploys ONAP
 function install_oom {
-    local k8s_deployment_tool="kubespray"
-
-    mount_external_partition sda /var/lib/docker/
-    install_kubernetes kubespray
+    install_kubernetes $k8s_deployment_tool
     if [[ "$deployment_tool" == "rancher" ]]; then
         pushd ~/.kube
         install_python_package requests
@@ -79,10 +99,6 @@ function install_oom {
         sleep $oom_delay
     done
     install_helm
-    printf "Kubernetes Info\n===============\n" > k8s_info.log
-    echo "Dashboard URL: http://$IP_ADDRESS:$(kubectl get service -n kube-system |grep kubernetes-dashboard | awk '{print $5}' |awk -F "[:/]" '{print $2}')" >> k8s_info.log
-    echo "Admin user: $(cat /etc/kubernetes/users/known_users.csv |awk -F ',' '{print $2}')" >> k8s_info.log
-    echo "Admin password: $(cat /etc/kubernetes/users/known_users.csv |awk -F ',' '{print $1}')" >> k8s_info.log
 
     if [[ "$clone_repo" != "True" ]]; then
         clone_repos "oom"
@@ -91,10 +107,14 @@ function install_oom {
     make repo
     make all
     helm install local/onap -n beijing -f /var/onap/files/dev.yaml
+    popd
 }
 
 # init_oom() - Function that deploys ONAP using OOM
 function init_oom {
+    local k8s_info_file=/var/log/k8s_info.log
+    mount_external_partition sda /var/lib/docker/
+
     if [[ "$clone_repo" == "True" ]]; then
         clone_repos "oom"
     fi
@@ -103,5 +123,12 @@ function init_oom {
     fi
     if [[ "$skip_install" == "False" ]]; then
         install_oom
+        if [[ "$k8s_deployment_tool" == "kubespray" ]]; then
+            printf "Kubernetes Info\n===============\n" > $k8s_info_file
+            echo "Dashboard URL: https://$IP_ADDRESS:$(kubectl get service -n kube-system |grep kubernetes-dashboard | awk '{print $5}' |awk -F "[:/]" '{print $2}')" >> $k8s_info_file
+            echo "Admin user: $(cat /etc/kubernetes/users/known_users.csv |awk -F ',' '{print $2}')" >> $k8s_info_file
+            echo "Admin password: $(cat /etc/kubernetes/users/known_users.csv |awk -F ',' '{print $1}')" >> $k8s_info_file
+            cat $k8s_info_file
+        fi
     fi
 }
-- 
cgit 1.2.3-korg