diff options
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/asserts | 74 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/mr | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | bootstrap/vagrant-onap/lib/sdc (renamed from bootstrap/vagrant-onap/lib/asdc) | 71 |
3 files changed, 42 insertions, 109 deletions
diff --git a/bootstrap/vagrant-onap/lib/asserts b/bootstrap/vagrant-onap/lib/asserts deleted file mode 100755 index 02c269b4c..000000000 --- a/bootstrap/vagrant-onap/lib/asserts +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -set -o xtrace - -source /var/onap/commons - -# asserts_process() - Function that verifies if a specific process is running -function asserts_process { - local process=$1 - local error_msg=${2:-"There is no $process running process"} - - if [[ "ps -ef | grep $process" == "" ]]; then - raise_error $error_msg - fi -} - -# asserts_java_process() - Function that verifies if a specific java process is running -function asserts_java_process { - local process=$1 - local error_msg=${2:-"There is no $process java running process"} - - install_java - if [[ "jps | grep $process" == "" ]]; then - raise_error $error_msg - fi -} - -# asserts_image_running() - Function that verifies if a specific image is running -function asserts_image_running { - local image=$1 - local error_msg=${2:-"There is no process with $image image running"} - - asserts_image $image - if [[ "$(docker ps -q --filter=ancestor=$image 2> /dev/null)" == "" ]]; then - raise_error $error_msg - fi -} - -# asserts_image() - Function that verifies if a specific image was created -function asserts_image { - local image=$1 - local error_msg=${2:-"There is no $image image"} - - install_docker - if [[ "$(docker images -q $image 2> /dev/null)" == "" ]]; then - raise_error $error_msg - fi -} - -# asserts_installed_package() - Function that verifies if a specific package was installed. -function asserts_installed_package { - local package=$1 - local error_msg=${2:-"$package wasn't installed"} - - if ! is_package_installed $package; then - raise_error $error_msg - fi -} - -# asserts_file_exist() - Function that verifies if a specific file exists -function asserts_file_exist { - local file=$1 - local error_msg=${2:-"$file doesn't exist"} - - if [ ! -f $file ]; then - raise_error $error_msg - fi -} - -# raise_error() - Function that prints and exits the execution -function raise_error { - echo $@ - exit 1 -} diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr index 5bd1d1aaf..a137f73bb 100755 --- a/bootstrap/vagrant-onap/lib/mr +++ b/bootstrap/vagrant-onap/lib/mr @@ -4,11 +4,11 @@ set -o xtrace source /var/onap/functions -src_folder=$git_src_folder/dcae/message-router +mr_src_folder=$git_src_folder/dcae/message-router # clone_mr_repos() - Function that clones the Message Router repositories function clone_mr_repos { - clone_repo dcae/demo/startup/message-router $src_folder + clone_repo dcae/demo/startup/message-router $mr_src_folder } # get_mr_images() - Function that retrieves the Message Router Docker images @@ -21,7 +21,7 @@ function get_mr_images { function install_message_router { install_docker_compose - pushd $src_folder + pushd $mr_src_folder bash deploy.sh popd } diff --git a/bootstrap/vagrant-onap/lib/asdc b/bootstrap/vagrant-onap/lib/sdc index fb7b40b04..1c872fa48 100755..100644 --- a/bootstrap/vagrant-onap/lib/asdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -3,13 +3,13 @@ set -o xtrace source /var/onap/functions -source /var/onap/asserts -src_folder=$git_src_folder/sdc +sdc_src_folder=$git_src_folder/sdc +sdc_repos=("sdc-os-chef" "jtosca" "sdc-distribution-client" "sdc-titan-cassandra" "sdc-tosca" "sdc_common") -# mount_external_partition() - Create partition and mount the external volume -function mount_external_partition { - cat <<EOL > /tmp/asdc_ext_volume_partitions.txt +# _mount_external_partition() - Create partition and mount the external volume +function _mount_external_partition { + cat <<EOL > /tmp/sdc_ext_volume_partitions.txt # partition table of /dev/sdb unit: sectors @@ -18,15 +18,15 @@ unit: sectors /dev/sdb3 : start= 0, size= 0, Id= 0 /dev/sdb4 : start= 0, size= 0, Id= 0 EOL - sfdisk --force /dev/sdb < /tmp/asdc_ext_volume_partitions.txt + sfdisk --force /dev/sdb < /tmp/sdc_ext_volume_partitions.txt mkfs -t ext4 /dev/sdb1 mkdir -p /data mount /dev/sdb1 /data echo "/dev/sdb1 /data ext4 errors=remount-ro,noatime,barrier=0 0 1" >> /etc/fstab } -# init_data_folders() - Function that initialize the data folders -function init_data_folders { +# _init_data_folders() - Function that initialize the data folders +function _init_data_folders { mkdir -p /data/environments mkdir -p /data/scripts mkdir -p /data/logs/BE @@ -35,8 +35,8 @@ function init_data_folders { chmod 777 /data/logs } -# setup_docker_aliases() - Function that setups the aliases required by sdc scripts -function setup_docker_aliases { +# _setup_docker_aliases() - Function that setups the aliases required by sdc scripts +function _setup_docker_aliases { cat <<EOL > /root/.bash_aliases alias dcls='/data/scripts/docker_clean.sh \$1' alias dlog='/data/scripts/docker_login.sh \$1' @@ -47,23 +47,36 @@ EOL # clone_all_sdc_repos() - Function that clones SDC source repo. function clone_all_sdc_repos { - clone_repo sdc $src_folder + clone_repo sdc $sdc_src_folder - for dirc in sdc-os-chef jtosca sdc-distribution-client sdc-titan-cassandra sdc-tosca sdc_common ; do - clone_repo sdc/$dirc $src_folder/$dirc + for dirc in ${sdc_repos[@]}; do + clone_repo sdc/$dirc $sdc_src_folder/$dirc done } # compile_all_sdc_repos() - Function that compiles SDC source repo. function compile_all_sdc_repos { - local src_folder=/opt/sdc - clone_repo sdc $src_folder + clone_repo sdc $sdc_src_folder - for dirc in jtosca sdc-distribution-client sdc-titan-cassandra sdc-tosca sdc_common ; do - compile_src $src_folder/$dirc + for dirc in ${sdc_repos[@]}; do + compile_src $sdc_src_folder/$dirc done } +# get_sdc_images() - Function that retrieves the SDC docker images +function get_sdc_images { + if [[ "$build_image" == "True" ]]; then + if [[ "$compile_repo" != "True" ]]; then + compile_src $sdc_src_folder + fi + build_docker_image $sdc_src_folder/sdc-os-chef docker + else + for image in backend frontend elasticsearch kibana cassandra sanity; do + pull_openecomp_image openecomp/sdc-$image + done + fi +} + # install_sdc() - Function that pull templates and executes function install_sdc { local ENV_NAME=$dmaap_topic @@ -71,16 +84,10 @@ function install_sdc { local RELEASE=$docker_version NEXUS_DOCKER_PORT=$(echo $nexus_docker_repo | cut -d':' -f2) - if [[ "$build_image" == "True" ]]; then - compile_src $src_folder - build_docker_image $src_folder/sdc-os-chef docker - for image in backend frontend elasticsearch kibana cassandra sanity; do - asserts_image openecomp/sdc-$image - done - fi - cp $src_folder/sdc-os-chef/environments/Template.json /data/environments - cp $src_folder/sdc-os-chef/scripts/docker_run.sh /data/scripts - cp $src_folder/sdc-os-chef/scripts/docker_health.sh /data/scripts + _init_data_folders + cp $sdc_src_folder/sdc-os-chef/environments/Template.json /data/environments + cp $sdc_src_folder/sdc-os-chef/scripts/docker_run.sh /data/scripts + cp $sdc_src_folder/sdc-os-chef/scripts/docker_health.sh /data/scripts chmod +x /data/scripts/docker_run.sh chmod +x /data/scripts/docker_health.sh @@ -96,16 +103,16 @@ function install_sdc { fi } -# init_asdc() - Function that initialize SDC services -function init_asdc { - mount_external_partition - init_data_folders - setup_docker_aliases +# init_sdc() - Function that initialize SDC services +function init_sdc { + _mount_external_partition if [[ "$clone_repo" == "True" ]]; then clone_all_sdc_repos if [[ "$compile_repo" == "True" ]]; then compile_all_sdc_repos fi fi + get_sdc_images install_sdc + _setup_docker_aliases } |