Merge "Replace Fuel Web with Mirantis OpenStack in scripts and README"

This commit is contained in:
Jenkins 2013-12-20 14:36:43 +00:00 committed by Gerrit Code Review
commit a909d747d4
3 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
In order to successfully run Fuel Web under VirtualBox, you need to:
In order to successfully run Mirantis OpenStack under VirtualBox, you need to:
- download the official release (.iso) and place it under 'iso' directory
- run "./launch.sh". it will automatically pick up the iso, and will spin up master node and slave nodes

View File

@ -17,7 +17,7 @@
#
# This script performs initial check and configuration of the host system. It:
# - verifies that all available command-line tools are present on the host system
# - check that there is no previous installation of Fuel Web (if there is one, the script deletes it)
# - check that there is no previous installation of Mirantis OpenStack (if there is one, the script deletes it)
# - creates host-only network interfaces
#
# We are avoiding using 'which' because of http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script
@ -47,14 +47,14 @@ fi
echo "OK"
# Check for ISO image to be available
echo -n "Checking for Fuel Web ISO image... "
echo -n "Checking for Mirantis OpenStack ISO image... "
if [ -z $iso_path ]; then
echo "Fuel Web image is not found. Please download it and put under 'iso' directory."
echo "Mirantis OpenStack image is not found. Please download it and put under 'iso' directory."
exit 1
fi
echo "OK"
# Delete all VMs from the previous Fuel Web installation
# Delete all VMs from the previous Mirantis OpenStack installation
delete_vms_multiple $vm_name_prefix
# Delete all host-only interfaces

View File

@ -23,8 +23,8 @@ cluster_size=3
# Get the first available ISO from the directory 'iso'
iso_path=`ls -1t iso/*.iso 2>/dev/null | head -1`
# Every Fuel Web machine name will start from this prefix
vm_name_prefix=fuel-web-
# Every Mirantis OpenStack machine name will start from this prefix
vm_name_prefix=fuel-
# Host interfaces to bridge VMs interfaces with
idx=0