openstack/designate
Code Issues Proposed changes

Split Vagrant out of contrib/devstack

Browse Source 
Change-Id: I9680ab20cd480f3100a628675cc813f46bcb6813
This commit is contained in:
Kiall Mac Innes 2014-09-13 14:33:58 +01:00
parent 981a132090
commit 2343e34906
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -26,4 +26,4 @@ designate/versioninfo
/bind9 /bind9
/dnsmasq /dnsmasq
.testrepository/* .testrepository/*
contrib/devstack/.vagrant/ contrib/vagrant/.vagrant/

7
contrib/devstack/Vagrantfile → contrib/vagrant/Vagrantfile vendored
View File

@ -31,13 +31,16 @@ if [ ! -d "/home/vagrant/devstack" ]; then
git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack
fi fi
# Install Designate DevStack extension # Install Vagrant localrc sample
cd /vagrant cd /opt/stack/designate/contrib/vagrant
if [ ! -f "/home/vagrant/devstack/localrc" ]; then if [ ! -f "/home/vagrant/devstack/localrc" ]; then
cp localrc /home/vagrant/devstack/localrc cp localrc /home/vagrant/devstack/localrc
fi fi
# Install Designate DevStack extension
cd /opt/stack/designate/contrib/devstack
for f in lib/* extras.d/* exercises/*; do for f in lib/* extras.d/* exercises/*; do
if [ ! -f "/home/vagrant/devstack/$f" ]; then if [ ! -f "/home/vagrant/devstack/$f" ]; then
ln -fs /vagrant/$f -t /home/vagrant/devstack/$(dirname $f) ln -fs /vagrant/$f -t /home/vagrant/devstack/$(dirname $f)

3
contrib/devstack/localrc → contrib/vagrant/localrc
View File

@ -1,6 +1,3 @@
# **** NOTE **** Changes to this file only affect the local vagrant environment
# and not the gate jobs
# Passwords # Passwords
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
MYSQL_PASSWORD=password MYSQL_PASSWORD=password