diff options
| author |   Victor Morales <victor.morales@intel.com> | 2017-11-07 14:13:07 -0800 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2017-11-07 14:13:07 -0800 |
| commit | 071b81cf985c482bb0a38ca1c96491feefd1ec13 (patch) | |
| tree | 11072bd3672e99577902e1cf76d2dd80d0637e73 | |
| parent | 9174eadc3cadf827669fc0999304b0221ff2349c (diff) | |
Integrate install_dev_tools into install_docker
The packages installed by the install_dev_tools are only required by
the docker installation, therefore is not necessary to install them
in other cases. According to the Docker official documentation the
linux-image-extra-* packages are required.
Change-Id: I96c5f556c9e5a74d52e012d7896786061299036e
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-Id: INT-328
| -rw-r--r-- | bootstrap/vagrant-onap/Vagrantfile | 20 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/functions | 7 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_functions | 11 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/vagrant_utils/postinstall.sh | 1 |
4 files changed, 12 insertions, 27 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile index 0664e5fbb..4242919f7 100644 --- a/bootstrap/vagrant-onap/Vagrantfile +++ b/bootstrap/vagrant-onap/Vagrantfile @@ -51,7 +51,7 @@ nodes = [ }, { :name => "all-in-one", - :ips => ['10.252.0.3', "192.168.50.3"], + :ips => ['10.252.1.3', "192.168.51.3"], :macs => [], :cpus => 2, :cpu => "50", @@ -183,7 +183,7 @@ nodes = [ }, { :name => "testing", - :ips => ['10.252.0.3', "192.168.50.3"], + :ips => ['10.252.2.3', "192.168.52.3"], :macs => [], :cpus => 2, :cpu => "50", @@ -213,14 +213,14 @@ nodes = [ :args => ['vid'], }, { - :name => "vnfsdk", - :ips => ['10.252.0.16', "192.168.50.16"], - :macs => [], - :cpus => 2, - :cpu => "50", - :ram => 4 * 1024, - :groups => ["individual"], - :args => ['vnfsdk'], + :name => "vnfsdk", + :ips => ['10.252.0.18', "192.168.50.18"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ['vnfsdk'], }, { :name => "vvp", diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions index ce95ea010..cc9052304 100755 --- a/bootstrap/vagrant-onap/lib/functions +++ b/bootstrap/vagrant-onap/lib/functions @@ -58,11 +58,6 @@ function clone_repo { fi } -# install_dev_tools() - Install basic dependencies -function install_dev_tools { - install_packages apt-transport-https ca-certificates curl -} - # _install_bind() - Install bind utils function _install_bind { install_packages bind9 bind9utils @@ -193,7 +188,7 @@ function install_docker { *suse) ;; ubuntu|debian) - install_package software-properties-common + install_packages software-properties-common linux-image-extra-$(uname -r) linux-image-extra-virtual apt-transport-https ca-certificates curl curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions index 3ab5828cb..a6d225bc6 100644 --- a/bootstrap/vagrant-onap/tests/test_functions +++ b/bootstrap/vagrant-onap/tests/test_functions @@ -4,7 +4,7 @@ source /var/onap_tests/_test_base source /var/onap/functions covered_functions=( -"create_configuration_files" "clone_repo" "install_dev_tools" +"create_configuration_files" "clone_repo" "configure_bind" "install_java" "install_maven" "install_nodejs" "install_python" "install_docker" "pull_docker_image" "install_docker_compose" "configure_service" "start_ODL" "compile_src" "build_docker_image" "docker_openecomp_login" @@ -55,15 +55,6 @@ function test_clone_repo { asserts_file_exist $git_src_folder/demo/LICENSE.TXT } -# test_install_dev_tools() - Verify the correct installation of developer tools -function test_install_dev_tools { - install_dev_tools - - asserts_installed_package apt-transport-https - asserts_installed_package ca-certificates - asserts_installed_package curl -} - # test_configure_bind() - Verify the correct installation and configuration of bind function test_configure_bind { configure_bind diff --git a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh index 748d1b553..c1b1c33a2 100755 --- a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh +++ b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh @@ -8,7 +8,6 @@ source /var/onap/functions update_repos create_configuration_files -install_dev_tools configure_bind for serv in $@; do |