Integrate devstack plugin with Vagrant setup

This integrates the freshly added devstack plugin with the Kuryr
Vagrant setup.

Also cleans up a few nits found while here in plugin.sh

Change-Id: I5de55e7d6415d4bffe8bb7a2b2e5e15188815c36
Signed-off-by: Kyle Mestery <mestery@mestery.com>
This commit is contained in:
Kyle Mestery 2015-11-25 09:43:03 -06:00
parent e8b93b8ada
commit a68600fc6c
9 changed files with 13 additions and 53 deletions

2
.gitignore vendored
View File

@ -49,3 +49,5 @@ ChangeLog
!/.mailmap !/.mailmap
!/.pylintrc !/.pylintrc
!/.testr.conf !/.testr.conf
contrib/vagrant/.vagrant

View File

@ -20,6 +20,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
v.customize ["set", :id, "--nested-virt", "on"] v.customize ["set", :id, "--nested-virt", "on"]
end end
config.vm.synced_folder "../../devstack/", "/vagrant/devstack"
config.vm.provision :shell, :path => "vagrant.sh" config.vm.provision :shell, :path => "vagrant.sh"
if Vagrant.has_plugin?("vagrant-cachier") if Vagrant.has_plugin?("vagrant-cachier")

View File

@ -1,29 +0,0 @@
OFFLINE=No
RECLONE=No
# Credentials
ADMIN_PASSWORD=pass
DATABASE_PASSWORD=pass
RABBIT_PASSWORD=pass
SERVICE_PASSWORD=pass
SERVICE_TOKEN=pass
HOST_IP=127.0.0.1
ENABLED_SERVICES=True
# Ensure we are using neutron networking rather than nova networking
# (Neutron is enabled by default since Kilo)
disable_service n-net
enable_service q-svc
enable_service q-agt
enable_service q-dhcp
enable_service q-l3
enable_service q-meta
enable_service neutron
enable_service key
enable_service mysql
enable_service rabbit
# Log all output to files
LOGFILE=$HOME/devstack.log
SCREEN_LOGDIR=$HOME/logs

View File

@ -22,14 +22,12 @@ then
echo "Copy configuration" echo "Copy configuration"
# copy localrc settings (source: devstack/samples/localrc) # copy local.conf.sample settings (source: kuryr/devstack/local.conf.sample)
echo "copy config from $BASHPATH/config/localrc to $DEVSTACK/localrc" cp /vagrant/devstack/local.conf.sample $DEVSTACK/local.conf
cp "$BASHPATH"/config/localrc "$DEVSTACK"/localrc chown "$OS_USER":"$OS_USER" "$DEVSTACK"/local.conf
chown "$OS_USER":"$OS_USER" "$DEVSTACK"/localrc
fi fi
# start devstack # start devstack
echo "Start Devstack" echo "Start Devstack"
su "$OS_USER" -c "cd $DEVSTACK && ./stack.sh" su "$OS_USER" -c "cd $DEVSTACK && ./stack.sh"

View File

@ -1,2 +0,0 @@
#!/bin/bash
su "$OS_USER" -c "curl -sSL https://test.docker.com/ | sh"

View File

@ -1,10 +0,0 @@
#!/bin/sh
echo "running apt-get install python-pip"
sudo apt-get install -qqy python-pip
echo "running git clone kuryr"
su "$OS_USER" -c "cd ~ && git clone -b master https://github.com/openstack/kuryr"
su "$OS_USER" -c "cd ~/kuryr && sudo pip install -r requirements.txt"

View File

@ -6,12 +6,5 @@ export OS_HOST_IP=172.68.5.10
# run script # run script
sh /vagrant/devstack.sh sh /vagrant/devstack.sh
# install experimetal docker
sh /vagrant/docker.sh
#install kuryr
sh /vagrant/install_kuryr.sh
#set environment variables for kuryr #set environment variables for kuryr
su "$OS_USER" -c "echo 'source /vagrant/config/kuryr_rc' >> ~/.bashrc" su "$OS_USER" -c "echo 'source /vagrant/config/kuryr_rc' >> ~/.bashrc"

View File

@ -1,5 +1,8 @@
[[local|localrc]] [[local|localrc]]
LOGFILE=stack.sh.log
LOG_COLOR=False
DATABASE_PASSWORD=pass DATABASE_PASSWORD=pass
RABBIT_PASSWORD=pass RABBIT_PASSWORD=pass
SERVICE_PASSWORD=pass SERVICE_PASSWORD=pass

View File

@ -11,6 +11,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Save trace setting
XTRACE=$(set +o | grep xtrace)
set +o xtrace
function install_etcd_data_store { function install_etcd_data_store {