diff options
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/aai | 4 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/appc | 8 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/ccsdk | 7 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/dcae | 8 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/mr | 8 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/mso | 16 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/multicloud | 12 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/policy | 8 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/portal | 11 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/robot | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | bootstrap/vagrant-onap/lib/sdc | 47 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/sdnc | 9 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/vfc | 8 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/vid | 8 |
14 files changed, 103 insertions, 60 deletions
diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai index 7d87870a0..bd72ae0f3 100755 --- a/bootstrap/vagrant-onap/lib/aai +++ b/bootstrap/vagrant-onap/lib/aai @@ -199,5 +199,7 @@ function init_aai { install_ajsc_aai _wait_for_sdc - install_model_loader + if [[ "$skip_install" == "False" ]]; then + install_model_loader + fi } diff --git a/bootstrap/vagrant-onap/lib/appc b/bootstrap/vagrant-onap/lib/appc index 33980aeea..5e3858f16 100755 --- a/bootstrap/vagrant-onap/lib/appc +++ b/bootstrap/vagrant-onap/lib/appc @@ -52,6 +52,10 @@ function init_appc { fi fi - get_appc_images - install_appc + if [[ "$skip_get_images" == "False" ]]; then + get_appc_images + if [[ "$skip_install" == "False" ]]; then + install_appc + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/ccsdk b/bootstrap/vagrant-onap/lib/ccsdk index 6ea829fb5..85cdf4da2 100755 --- a/bootstrap/vagrant-onap/lib/ccsdk +++ b/bootstrap/vagrant-onap/lib/ccsdk @@ -44,12 +44,6 @@ function get_ccsdk_images { pull_onap_image ccsdk-$image-image done fi - -} - -# install_ccsdk() - -function install_ccsdk { - echo "pass" } # init_ccsdk() - Function that initialize Multi Cloud services @@ -60,5 +54,4 @@ function init_ccsdk { compile_ccsdk_repos fi fi - install_ccsdk } diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae index 43da9f59b..3e702d989 100755 --- a/bootstrap/vagrant-onap/lib/dcae +++ b/bootstrap/vagrant-onap/lib/dcae @@ -128,6 +128,10 @@ function init_dcae { fi _create_config_file - get_dcae_images - install_dcae + if [[ "$skip_get_images" == "False" ]]; then + get_dcae_images + if [[ "$skip_install" == "False" ]]; then + install_dcae + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr index a137f73bb..f221817fa 100755 --- a/bootstrap/vagrant-onap/lib/mr +++ b/bootstrap/vagrant-onap/lib/mr @@ -31,6 +31,10 @@ function init_mr { if [[ "$clone_repo" == "True" ]]; then clone_mr_repos fi - get_mr_images - install_message_router + if [[ "$skip_get_images" == "False" ]]; then + get_mr_images + if [[ "$skip_install" == "False" ]]; then + install_message_router + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/mso b/bootstrap/vagrant-onap/lib/mso index 4b209062d..6ff4bbe3e 100755 --- a/bootstrap/vagrant-onap/lib/mso +++ b/bootstrap/vagrant-onap/lib/mso @@ -25,8 +25,8 @@ function compile_all_mso_repos { done } -# install_mso() - Installation of mso images -function install_mso { +# get_mso_images() - Function that retrieves or create MSO Docker images +function get_mso_images { if [[ "$build_image" == "True" ]]; then export GIT_NO_PROJECT=/opt/ compile_src $src_folder @@ -34,8 +34,8 @@ function install_mso { fi } -# install_mso_docker_config() - Download and install MSO Docker configuration project -function install_mso_docker_config { +# install_mso() - Install MSO Docker configuration project +function install_mso { MSO_ENCRYPTION_KEY=$(cat /opt/mso/docker-config/encryption.key) echo -n "$openstack_api_key" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt @@ -108,6 +108,10 @@ function init_mso { fi fi - install_mso - install_mso_docker_config + if [[ "$skip_get_images" == "False" ]]; then + get_mso_images + if [[ "$skip_install" == "False" ]]; then + install_mso + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/multicloud b/bootstrap/vagrant-onap/lib/multicloud index 1126d6146..1c781fed2 100755 --- a/bootstrap/vagrant-onap/lib/multicloud +++ b/bootstrap/vagrant-onap/lib/multicloud @@ -25,6 +25,11 @@ function compile_multicloud_repos { done } +# get_multicloud_images() - +function get_multicloud_images { + echo "pass" +} + # install_multicloud() - function install_multicloud { echo "pass" @@ -38,5 +43,10 @@ function init_multicloud { compile_multicloud_repos fi fi - install_multicloud + if [[ "$skip_get_images" == "False" ]]; then + get_multicloud_images + if [[ "$skip_install" == "False" ]]; then + install_multicloud + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy index ce3405614..f43087b1d 100755 --- a/bootstrap/vagrant-onap/lib/policy +++ b/bootstrap/vagrant-onap/lib/policy @@ -65,6 +65,10 @@ function init_policy { fi fi - get_policy_images - install_policy + if [[ "$skip_get_images" == "False" ]]; then + get_policy_images + if [[ "$skip_install" == "False" ]]; then + install_policy + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/portal b/bootstrap/vagrant-onap/lib/portal index 998d6c075..4dc5ef9b8 100755 --- a/bootstrap/vagrant-onap/lib/portal +++ b/bootstrap/vagrant-onap/lib/portal @@ -67,6 +67,7 @@ function install_portal { install_package unzip unzip -o etc.zip -d /PROJECT/OpenSource/UbuntuEP/ + _install_mariadb install_docker_compose bash portal_vm_init.sh @@ -88,7 +89,11 @@ function init_portal { compile_all_portal_repos fi fi - get_portal_images - _install_mariadb - install_portal + + if [[ "$skip_get_images" == "False" ]]; then + get_portal_images + if [[ "$skip_install" == "False" ]]; then + install_portal + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/robot b/bootstrap/vagrant-onap/lib/robot index 34b431a54..ebcca6e6b 100755 --- a/bootstrap/vagrant-onap/lib/robot +++ b/bootstrap/vagrant-onap/lib/robot @@ -59,6 +59,11 @@ function init_robot { compile_robot_repos fi fi - get_robot_images - install_robot + + if [[ "$skip_get_images" == "False" ]]; then + get_robot_images + if [[ "$skip_install" == "False" ]]; then + install_robot + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index 058048960..c7f79d64d 100644..100755 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -66,16 +66,11 @@ function compile_all_sdc_repos { # 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-docker-base else - if [["$pull_docker_image" == True]]; then - for image in backend frontend elasticsearch kibana cassandra sanity; do - pull_openecomp_image openecomp/sdc-$image - done - fi + for image in backend frontend elasticsearch kibana cassandra sanity; do + pull_openecomp_image openecomp/sdc-$image + done fi } @@ -85,28 +80,23 @@ function install_sdc { local MR_IP_ADDR='10.0.11.1' _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 - cp $sdc_src_folder/sdc-os-chef/scripts/docker_login.sh /data/scripts - cp $sdc_src_folder/sdc-os-chef/scripts/docker_clean.sh /data/scripts - chmod +x /data/scripts/docker_run.sh - chmod +x /data/scripts/docker_health.sh - chmod +x /data/scripts/docker_login.sh - chmod +x /data/scripts/docker_clean.sh - + 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 + cp $sdc_src_folder/sdc-os-chef/scripts/docker_login.sh /data/scripts + cp $sdc_src_folder/sdc-os-chef/scripts/docker_clean.sh /data/scripts + chmod +x /data/scripts/docker_run.sh + chmod +x /data/scripts/docker_health.sh + chmod +x /data/scripts/docker_login.sh + chmod +x /data/scripts/docker_clean.sh + cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" /data/environments/$ENV_NAME.json sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json install_docker - if [[ "$pull_docker_image" == "True" ]]; then - docker_openecomp_login - bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2) - else - bash /data/scripts/docker_run.sh -e $ENV_NAME -l - fi + bash /data/scripts/docker_run.sh -e $ENV_NAME -l } # init_sdc() - Function that initialize SDC services @@ -118,7 +108,12 @@ function init_sdc { compile_all_sdc_repos fi fi - get_sdc_images - install_sdc + + if [[ "$skip_get_images" == "False" ]]; then + get_sdc_images + if [[ "$skip_install" == "False" ]]; then + install_sdc + fi + fi _setup_docker_aliases } diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc index c6d013b79..22066fdd4 100755 --- a/bootstrap/vagrant-onap/lib/sdnc +++ b/bootstrap/vagrant-onap/lib/sdnc @@ -71,6 +71,11 @@ function init_sdnc { compile_all_sdnc_repos fi fi - get_sdnc_images - install_sdnc + + if [[ "$skip_get_images" == "False" ]]; then + get_sdnc_images + if [[ "$skip_install" == "False" ]]; then + install_sdnc + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc index a87944879..5cf0ed13b 100755 --- a/bootstrap/vagrant-onap/lib/vfc +++ b/bootstrap/vagrant-onap/lib/vfc @@ -106,6 +106,10 @@ function init_vfc { fi fi - get_vfc_images - install_vfc + if [[ "$skip_get_images" == "False" ]]; then + get_vfc_images + if [[ "$skip_install" == "False" ]]; then + install_vfc + fi + fi } diff --git a/bootstrap/vagrant-onap/lib/vid b/bootstrap/vagrant-onap/lib/vid index 55f399ab0..83b530995 100755 --- a/bootstrap/vagrant-onap/lib/vid +++ b/bootstrap/vagrant-onap/lib/vid @@ -56,6 +56,10 @@ function init_vid { fi fi - get_vid_images - install_vid + if [[ "$skip_get_images" == "False" ]]; then + get_vid_images + if [[ "$skip_install" == "False" ]]; then + install_vid + fi + fi } |