openstack
/
designate
Code Issues Proposed changes

Ensure Vagrantfile works for Kilo 

* Rally does not support stable branches, remove it.
* Ensure we checkout the Kilo branch of DevStack.

Change-Id: I1463426a8efc828996bf4a6ae9c003874da0b441
This commit is contained in:
Kiall Mac Innes 2015-07-13 12:57:12 +01:00
parent 33510373af
commit ef3d7cbf95
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/vagrant/Vagrantfile vendored
View File

@ -21,10 +21,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if File.directory?("../../../python-designateclient")
config.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient"
end
if File.directory?("../../../../stackforge/rally")
config.vm.synced_folder "../../../../stackforge/rally", "/opt/stack/rally"
end
end
config.vm.provider :libvirt do |lv|
@ -41,10 +37,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if File.directory?("../../../python-designateclient")
config.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient", type: "nfs"
end
if File.directory?("../../../../stackforge/rally")
config.vm.synced_folder "../../../../stackforge/rally", "/opt/stack/rally", type: "nfs"
end
end
$script = <<SCRIPT
@ -61,6 +53,10 @@ EOF
# Clone DevStack
if [ ! -d "/home/vagrant/devstack" ]; then
git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack
pushd /home/vagrant/devstack
git checkout stable/kilo
popd
fi
# Install Vagrant localrc sample
@ -79,24 +75,6 @@ for f in lib/* extras.d/* exercises/*; do
fi
done
# Clone Rally
if [ ! -d "/opt/stack/rally" ]; then
git clone https://git.openstack.org/stackforge/rally.git /opt/stack/rally
fi
# Install Rally DevStack extension
cd /opt/stack/rally/contrib/devstack
for f in lib/* extras.d/*; do
if [ ! -f "/home/vagrant/devstack/$f" ]; then
ln -fs /opt/stack/rally/contrib/devstack/$f -t /home/vagrant/devstack/$(dirname $f)
fi
done
# Link in the Rally Plugins
mkdir /home/vagrant/.rally
ln -s /opt/stack/designate/rally-scenarios/plugins /home/vagrant/.rally/plugins
SCRIPT
config.vm.define "ubuntu" do |ubuntu|