diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-04 12:18:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-04 12:18:42 +0000 |
| commit | c2d2d7ec1229879107bbf3b7ad7f7bf28b351bc0 (patch) | |
| tree | 6b8dd4a8852587791c586408b8b6ec1d3552d711 | |
| parent | 32006d8149b68424a7a12171225ac914c30f16a6 (diff) | |
| parent | 95517f01fc7d082e3a48a8e282854ea4d537760a (diff) | |
| download | kolla-c2d2d7ec1229879107bbf3b7ad7f7bf28b351bc0.tar.gz kolla-c2d2d7ec1229879107bbf3b7ad7f7bf28b351bc0.zip | |
Merge "Use default disk image size for centos/7"
| -rw-r--r-- | dev/vagrant/Vagrantfile | 6 | ||||
| -rw-r--r-- | dev/vagrant/bootstrap.sh | 19 |
2 files changed, 0 insertions, 25 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile index 84e27fd5f..ea7cc299a 100644 --- a/dev/vagrant/Vagrantfile +++ b/dev/vagrant/Vagrantfile @@ -93,12 +93,6 @@ Vagrant.configure(2) do |config| admin.vm.synced_folder ".", get_default(:vagrant_shared_folder), disabled: true admin.vm.provider PROVIDER do |vm| vm.memory = MULTINODE ? 1024 : 4096 - if PROVIDER == 'libvirt' - # This only works with libvirt provider. - # We should be able to do something similar for virtualbox - # http://askubuntu.com/questions/317338/how-can-i-increase-disk-size-on-a-vagrant-vm - vm.machine_virtual_size = 40 - end end admin.hostmanager.aliases = "operator" end diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index dbe686043..14ea307dd 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -66,24 +66,6 @@ EOF usermod -aG docker vagrant } -function resize_partition { - fdisk /dev/vda <<EOF -n -p - - -t - -8e -w -EOF - partprobe - pvcreate /dev/vda4 - vgextend VolGroup00 /dev/vda4 - lvextend /dev/VolGroup00/LogVol00 /dev/vda4 - resize2fs /dev/VolGroup00/LogVol00 -} - function configure_kolla { # Use local docker registry sed -i -r "s,^[# ]*namespace.+$,namespace = ${REGISTRY}/lokolla," /etc/kolla/kolla-build.conf @@ -155,6 +137,5 @@ prep_work install_docker if [ "$1" = "operator" ]; then - resize_partition configure_operator fi |