openstack
/
fuel-main
Code Issues Proposed changes

Merge "Fixed search Fuel ISO in vbox scripts" into stable/6.0

This commit is contained in:
Jenkins 2014-12-22 05:34:44 +00:00 committed by Gerrit Code Review
parent 4a760ef183 f7defb6ad6
commit a5cec7ec52
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtualbox/actions/clean-previous-installation.sh
View File

@ -20,9 +20,9 @@
# - check that there is no previous installation of Mirantis OpenStack (if there is one, the script deletes it)
# Include the script with handy functions to operate VMs and VirtualBox networking
source config.sh
source functions/vm.sh
source functions/network.sh
source ./config.sh
source ./functions/vm.sh
source ./functions/network.sh
# Delete all VMs from the previous Mirantis OpenStack installation
delete_vms_multiple $vm_name_prefix

6
virtualbox/actions/create-interfaces.sh
View File

@ -21,9 +21,9 @@
#
# Include the script with handy functions to operate VMs and VirtualBox networking
source config.sh
source functions/vm.sh
source functions/network.sh
source ./config.sh
source ./functions/vm.sh
source ./functions/network.sh
# Delete all host-only interfaces
delete_all_hostonly_interfaces

6
virtualbox/actions/master-node-create-and-install.sh
View File

@ -20,9 +20,9 @@
#
# Include the handy functions to operate VMs and track ISO installation progress
source config.sh
source functions/vm.sh
source functions/product.sh
source ./config.sh
source ./functions/vm.sh
source ./functions/product.sh
# Create master node for the product
name="${vm_name_prefix}master"

6
virtualbox/actions/master-node-enable-internet.sh
View File

@ -22,9 +22,9 @@
# Typically, you would use this script after time after rebooting VirtualBox VM with the master node.
# Include the handy functions to operate VMs and track ISO installation progress
source config.sh
source functions/vm.sh
source functions/product.sh
source ./config.sh
source ./functions/vm.sh
source ./functions/product.sh
# Master node name
name="${vm_name_prefix}master"

6
virtualbox/actions/prepare-environment.sh
View File

@ -23,9 +23,9 @@
#
# Include the script with handy functions to operate VMs and VirtualBox networking
source config.sh
source functions/vm.sh
source functions/network.sh
source ./config.sh
source ./functions/vm.sh
source ./functions/network.sh
# Check for procps package
if [ "$(uname -s | cut -c1-6)" = "CYGWIN" ]; then

4
virtualbox/actions/slave-nodes-create-and-boot.sh
View File

@ -20,8 +20,8 @@
#
# Include the handy functions to operate VMs
source config.sh
source functions/vm.sh
source ./config.sh
source ./functions/vm.sh
# Create and start slave nodes
for idx in $(eval echo {1..$cluster_size}); do

2
virtualbox/config.sh
View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
source functions/memory.sh
source ./functions/memory.sh
# Get the first available ISO from the directory 'iso'
iso_path=`ls -1t iso/*.iso 2>/dev/null | head -1`