aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/mso
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-09-28 18:29:54 -0700
committerVictor Morales <victor.morales@intel.com>2017-09-28 18:29:54 -0700
commit6a919971cef56b9102dc358014006985d7eaba5b (patch)
treeb7b255803877bd9d162c34609e899795a504deed /bootstrap/vagrant-onap/lib/mso
parent35921f6c42432336777607d1b2ff53191adaf420 (diff)
Add support to configuration values
In order to make more flexible the execution workflow of this project, a new mechanism has been implemented to override the default configuration values. Change-Id: Ie6c5aeeb35b7f0de47379ea764ccc8dc21e4bff7 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-Id: INT-236
Diffstat (limited to 'bootstrap/vagrant-onap/lib/mso')
-rwxr-xr-xbootstrap/vagrant-onap/lib/mso16
1 files changed, 10 insertions, 6 deletions
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
}