openstack/kayobe
Code Issues Proposed changes

Merge pull request #7 from JohnGarbutt/tidy-ups

Browse Source 
stability improvements, plus selinux reboot avoidance
This commit is contained in:
John Garbutt 2017-08-29 13:31:05 +01:00 committed by GitHub
commit ae6b804e07
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Vagrantfile vendored
View File

@ -37,7 +37,10 @@ Vagrant.configure("2") do |config|
# the path on the host to the actual folder. The second argument is # the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third # the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options. # argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data"
# NOTE: To make this work install vbguest plugin to install tools in VM:
# vagrant plugin install vagrant-vbguest
config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
# Provider-specific configuration so you can fine-tune various # Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options. # backing providers for Vagrant. These expose provider-specific options.
@ -66,6 +69,20 @@ Vagrant.configure("2") do |config|
# documentation for more information about their specific syntax and use. # documentation for more information about their specific syntax and use.
# #
# Set privileged: false to run as vagrant user. # Set privileged: false to run as vagrant user.
# Disable selinux, then reboot to apply the change
config.vm.provision "shell", inline: <<-SHELL
echo "cat > /etc/selinux/config << EOF
SELINUX=disabled
SELINUXTYPE=targeted
EOF" | sudo -s
cat /etc/selinux/config
SHELL
# NOTE: Reboot to apply selinux change, requires the reload plugin:
# vagrant plugin install vagrant-reload
config.vm.provision :reload
config.vm.provision "shell", privileged: false, inline: <<-SHELL config.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo ifup eth1 sudo ifup eth1

1
dev/dev-vagrant.yml
View File

@ -51,7 +51,6 @@ inspection_net_name: aio
# All-in-one network. # All-in-one network.
aio_cidr: 192.168.33.0/24 aio_cidr: 192.168.33.0/24
aio_gateway: 192.168.33.1
aio_allocation_pool_start: 192.168.33.3 aio_allocation_pool_start: 192.168.33.3
aio_allocation_pool_end: 192.168.33.254 aio_allocation_pool_end: 192.168.33.254
aio_vip_address: 192.168.33.2 aio_vip_address: 192.168.33.2

9
doc/source/development.rst
View File

@ -8,7 +8,14 @@ machine using `Vagrant <https://www.vagrantup.com/>`_ and Kayobe.
Preparation Preparation
=========== ===========
First, ensure that Vagrant is installed and correctly configured. First, ensure that Vagrant is installed and correctly configured to use
virtual box. Also install the following vagrant plugins:
vagrant plugin install vagrant-vbguest
vagrant plugin install vagrant-reload
Note: if using Ubuntu 16.04 LTS, you may be unable to install any plugins. To
work around this install the upstream version from www.virtualbox.org.
Next, clone kayobe:: Next, clone kayobe::