diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-14 21:25:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-14 21:25:41 +0000 |
| commit | 2e849e8f97f64e09997e19af21056cb48e5aebd2 (patch) | |
| tree | 1b265841601a272b45c30448e6aa05c35a81909b | |
| parent | 6622e9493668f5bf3178bfc0a7c6fe53d1e2d89e (diff) | |
| parent | 79f663039153ec21aaf27d5c08d0b90038245a4c (diff) | |
| download | designate-2e849e8f97f64e09997e19af21056cb48e5aebd2.tar.gz | |
Merge "Force the devstack plugin to use the liberty version of devstack" into stable/liberty
| -rw-r--r-- | contrib/vagrant/Vagrantfile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index d19d1124..76b5d64e 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile @@ -69,6 +69,9 @@ 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 -b stable/liberty origin/stable/liberty + popd fi # Install Vagrant localrc sample |