diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-18 21:12:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-18 21:12:15 +0000 |
| commit | 296b37cd90e1492ac7462c5fc4299c9b77cfdadf (patch) | |
| tree | ea7838466c03b6626909ad9b57e421019f1b84fe | |
| parent | 2c35fd11989cdabaa7d39b543ee41dc39be82f93 (diff) | |
| parent | 9431ab62af4c47141bad738f740eb2f174acd2cc (diff) | |
| download | kolla-296b37cd90e1492ac7462c5fc4299c9b77cfdadf.tar.gz kolla-296b37cd90e1492ac7462c5fc4299c9b77cfdadf.zip | |
Merge "Rename bootstrap.sh to centos-bootstrap.sh"
| -rw-r--r-- | dev/vagrant/Vagrantfile | 4 | ||||
| -rw-r--r-- | dev/vagrant/centos-bootstrap.sh (renamed from dev/vagrant/bootstrap.sh) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile index c6f4032c2..aa1d2b342 100644 --- a/dev/vagrant/Vagrantfile +++ b/dev/vagrant/Vagrantfile @@ -26,7 +26,7 @@ PROVIDER_DEFAULTS ||= { bridge_interface: "virbr0", vagrant_shared_folder: "/home/vagrant/sync", sync_method: "nfs", - provision_script: "bootstrap.sh", + provision_script: "centos-bootstrap.sh", kolla_path: "/home/vagrant/kolla" } }, @@ -36,7 +36,7 @@ PROVIDER_DEFAULTS ||= { bridge_interface: "wlp3s0b1", vagrant_shared_folder: "/vagrant", sync_method: "virtualbox", - provision_script: "bootstrap.sh", + provision_script: "centos-bootstrap.sh", kolla_path: "/home/vagrant/kolla" }, ubuntu: { diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/centos-bootstrap.sh index e5f98ffd9..e5f98ffd9 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/centos-bootstrap.sh |