|
|
@@ -54,9 +54,6 @@ FileUtils.mkdir(host_cache_path) unless File.exist?(host_cache_path) |
|
|
# Variables and fun things to make my life easier.
|
|
|
############
|
|
|
|
|
|
# Uncomment me for WEBGUI magic
|
|
|
WEBGUI_BRANCH = ENV['WEBGUI_BRANCH'] ||= "master"
|
|
|
WEBGUI_REPO = ENV['WEBGUI_REPO'] ||= "https://github.com/rackerlabs/solum-m2demo-ui.git"
|
|
|
DEVSTACK_BRANCH = ENV['DEVSTACK_BRANCH'] ||= "master"
|
|
|
DEVSTACK_REPO = ENV['DEVSTACK_REPO'] ||= "https://github.com/openstack-dev/devstack.git"
|
|
|
NOVADOCKER_BRANCH = ENV['NOVADOCKER_BRANCH'] ||= "master"
|
|
|
@@ -92,11 +89,6 @@ Vagrant.configure("2") do |config| |
|
|
config.vm.synced_folder ENV['NOVADOCKER'], '/opt/stack/nova-docker'
|
|
|
end
|
|
|
|
|
|
# Uncomment me for WEBGUI magic
|
|
|
if ENV['WEBGUI']
|
|
|
config.vm.synced_folder ENV['WEBGUI'], '/opt/stack/solum-gui'
|
|
|
end
|
|
|
|
|
|
if ENV['SOLUM_CLI']
|
|
|
config.vm.synced_folder ENV['SOLUM_CLI'], "/opt/stack/python-solumclient"
|
|
|
end
|
|
|
@@ -183,15 +175,6 @@ Vagrant.configure("2") do |config| |
|
|
SCRIPT
|
|
|
end
|
|
|
|
|
|
# uncomment me for WEBGUI magic
|
|
|
unless ENV['WEBGUI']
|
|
|
devstack.vm.provision :shell, :inline => <<-SCRIPT
|
|
|
su - vagrant -c "git clone #{WEBGUI_REPO} /opt/stack/solum-gui || echo /opt/stack/solum-gui already exists"
|
|
|
cd /opt/stack/solum-gui
|
|
|
su vagrant -c "git checkout #{WEBGUI_BRANCH}"
|
|
|
SCRIPT
|
|
|
end
|
|
|
|
|
|
devstack.vm.provision :shell, :inline => <<-SCRIPT
|
|
|
su - vagrant -c "git clone #{DEVSTACK_REPO} /home/vagrant/devstack || echo devstack already exists"
|
|
|
cd /home/vagrant/devstack
|
|
|
@@ -228,11 +211,6 @@ Vagrant.configure("2") do |config| |
|
|
SCRIPT
|
|
|
end
|
|
|
|
|
|
devstack.vm.provision :shell, :inline => <<-SCRIPT
|
|
|
cp /opt/stack/solum-gui/bridge/scripts/*.sh /home/vagrant
|
|
|
su vagrant -c "/opt/stack/solum-gui/start-demo.sh"
|
|
|
SCRIPT
|
|
|
|
|
|
end
|
|
|
|
|
|
end
|
|
|
|
0 comments on commit
d602d53