openstack/kolla-ansible
Code Issues Proposed changes

Update Vagrant dev environment

Browse Source 
- Updated Ubuntu image to use 16.04.
 - VirtualBox provider to use centos/7 image + vagrant-vbguest plugin.
 - Improved docs so it is clear that vagrant-vbguest plugin is only
   required with VirtualBox.
 - Clarified comment and made it independent of the release.
 - Refactored the kolla and kolla-ansible paths to be based on the
   username used by Vagrant, that can change depending on the image.

Change-Id: I23d84dcc3297c43eb12eff9c443d282281fc6c82
This commit is contained in:
Juan J. Martinez 2017-06-02 13:51:37 +01:00 committed by Juan J. Martínez
parent 53a4f23469
commit 056ecc55ea
4 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
contrib/dev/vagrant/Vagrantfile vendored
View File

@ -35,38 +35,37 @@ DISTRO ||= "centos"
# is libvirt. # is libvirt.
GRAPHICSIP ||= "127.0.0.1" GRAPHICSIP ||= "127.0.0.1"
# The bootstrap.sh provision_script requires CentOS 7 or Ubuntu 15.10.
# Provisioning other boxes than the default ones may therefore # Provisioning other boxes than the default ones may therefore
# require changes to bootstrap.sh. # require changes to bootstrap.sh.
PROVISION_SCRIPT ||= "bootstrap.sh" PROVISION_SCRIPT ||= "bootstrap.sh"
# The bootstrap.sh provisioning script requires CentOS or Ubuntu; see below
# for the supported versions for each provider.
#
# kolla and kolla-ansible will be mounted in $HOME and the username depends
# on the image.
#
PROVIDER_DEFAULTS ||= { PROVIDER_DEFAULTS ||= {
libvirt: { libvirt: {
centos: { centos: {
base_image: "centos/7", base_image: "centos/7",
bridge_interface: "virbr0", bridge_interface: "virbr0",
vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "nfs", sync_method: "nfs",
kolla_path: "/home/vagrant/kolla", username: "vagrant"
kolla_ansible_path: "/home/vagrant/kolla-ansible"
} }
}, },
virtualbox: { virtualbox: {
centos: { centos: {
base_image: "puppetlabs/centos-7.0-64-puppet", base_image: "centos/7",
bridge_interface: "wlp3s0b1", bridge_interface: "wlp3s0b1",
vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "virtualbox", sync_method: "virtualbox",
kolla_path: "/home/vagrant/kolla", username: "vagrant"
kolla_ansible_path: "/home/vagrant/kolla-ansible"
}, },
ubuntu: { ubuntu: {
base_image: "ubuntu/wily64", base_image: "ubuntu/xenial64",
bridge_interface: "wlp3s0b1", bridge_interface: "wlp3s0b1",
vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "virtualbox", sync_method: "virtualbox",
kolla_path: "/home/vagrant/kolla", username: "ubuntu"
kolla_ansible_path: "/home/vagrant/kolla-ansible"
} }
} }
} }
@ -176,6 +175,13 @@ Vagrant.configure(2) do |config|
config.vm.box = get_default(:base_image) config.vm.box = get_default(:base_image)
# these may change depending on the image
username = get_default(:username)
user_home = "/home/#{username}"
vagrant_shared_folder = "#{user_home}/sync"
kolla_path = "#{user_home}/kolla"
kolla_ansible_path = "#{user_home}/kolla-ansible"
# Next to the hostonly NAT-network there is a host-only network with all # Next to the hostonly NAT-network there is a host-only network with all
# nodes attached. Plus, each node receives a 3rd adapter connected to the # nodes attached. Plus, each node receives a 3rd adapter connected to the
# outside public network. # outside public network.
@ -198,12 +204,12 @@ Vagrant.configure(2) do |config|
chmod 600 /root/.ssh/authorized_keys chmod 600 /root/.ssh/authorized_keys
echo '#{my_publickey}' > /root/.ssh/id_rsa.pub echo '#{my_publickey}' > /root/.ssh/id_rsa.pub
chmod 644 /root/.ssh/id_rsa.pub chmod 644 /root/.ssh/id_rsa.pub
mkdir -p /home/vagrant/.ssh mkdir -p #{user_home}/.ssh
echo '#{my_privatekey}' >> /home/vagrant/.ssh/id_rsa echo '#{my_privatekey}' >> #{user_home}/.ssh/id_rsa
chmod 600 /home/vagrant/.ssh/* chmod 600 #{user_home}/.ssh/*
echo 'Host *' > ~vagrant/.ssh/config echo 'Host *' > #{user_home}/.ssh/config
echo StrictHostKeyChecking no >> ~vagrant/.ssh/config echo StrictHostKeyChecking no >> #{user_home}/.ssh/config
chown -R vagrant: /home/vagrant/.ssh chown -R #{username} #{user_home}/.ssh
EOS EOS
config.hostmanager.enabled = true config.hostmanager.enabled = true
@ -224,12 +230,12 @@ Vagrant.configure(2) do |config|
# The operator controls the deployment # The operator controls the deployment
config.vm.define "operator", primary: true do |admin| config.vm.define "operator", primary: true do |admin|
admin.vm.hostname = "operator.local" admin.vm.hostname = "operator.local"
admin.vm.provision :shell, path: PROVISION_SCRIPT, args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{get_default(:kolla_path)} #{get_default(:kolla_ansible_path)}" admin.vm.provision :shell, path: PROVISION_SCRIPT, args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{kolla_path} #{kolla_ansible_path}"
admin.vm.synced_folder kolla_ansible_repo_path, get_default(:kolla_ansible_path), create:"True", type: get_default(:sync_method) admin.vm.synced_folder kolla_ansible_repo_path, kolla_ansible_path, create:"True", type: get_default(:sync_method)
admin.vm.synced_folder kolla_repo_path, get_default(:kolla_path), create:"True", type: get_default(:sync_method) admin.vm.synced_folder kolla_repo_path, kolla_path, create:"True", type: get_default(:sync_method)
admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'operator'), "/data/host", create:"True", type: get_default(:sync_method) admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'operator'), "/data/host", create:"True", type: get_default(:sync_method)
admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method)
admin.vm.synced_folder ".", get_default(:vagrant_shared_folder), disabled: true admin.vm.synced_folder ".", vagrant_shared_folder, disabled: true
admin.vm.provider PROVIDER do |vm| admin.vm.provider PROVIDER do |vm|
vm.memory = MULTINODE ? get_setting(:operator, :memory) : get_setting(:aio, :memory) vm.memory = MULTINODE ? get_setting(:operator, :memory) : get_setting(:aio, :memory)
vm.cpus = MULTINODE ? get_setting(:operator, :cpus) : get_setting(:aio, :cpus) vm.cpus = MULTINODE ? get_setting(:operator, :cpus) : get_setting(:aio, :cpus)
@ -247,10 +253,10 @@ Vagrant.configure(2) do |config|
hostname = "#{node_type}0#{i}" hostname = "#{node_type}0#{i}"
config.vm.define hostname do |node| config.vm.define hostname do |node|
node.vm.hostname = "#{hostname}.local" node.vm.hostname = "#{hostname}.local"
node.vm.provision :shell, path: PROVISION_SCRIPT, args: "#{hostname} multinode #{get_default(:kolla_path)} #{get_default(:kolla_ansible_path)}" node.vm.provision :shell, path: PROVISION_SCRIPT, args: "#{hostname} multinode #{kolla_path} #{kolla_ansible_path}"
node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method) node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method)
node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method)
node.vm.synced_folder ".", get_default(:vagrant_shared_folder), disabled: true node.vm.synced_folder ".", vagrant_shared_folder, disabled: true
node.vm.provider PROVIDER do |vm| node.vm.provider PROVIDER do |vm|
vm.memory = get_setting(node_type.to_sym, :memory) vm.memory = get_setting(node_type.to_sym, :memory)
vm.cpus = get_setting(node_type.to_sym, :cpus) vm.cpus = get_setting(node_type.to_sym, :cpus)

20
contrib/dev/vagrant/Vagrantfile.custom.example
View File

@ -16,11 +16,16 @@
# is libvirt. # is libvirt.
# GRAPHICSIP = "127.0.0.1" # GRAPHICSIP = "127.0.0.1"
# The bootstrap.sh provision_script requires CentOS 7 or Ubuntu 15.10.
# Provisioning other boxes than the default ones may therefore # Provisioning other boxes than the default ones may therefore
# require changes to bootstrap.sh. # require changes to bootstrap.sh.
# PROVISION_SCRIPT = "bootstrap.sh" # PROVISION_SCRIPT = "bootstrap.sh"
# The bootstrap.sh provisioning script requires CentOS or Ubuntu; see below
# for the supported versions for each provider.
#
# kolla and kolla-ansible will be mounted in $HOME and the username depends
# on the image.
#
# PROVIDER_DEFAULTS = { # PROVIDER_DEFAULTS = {
# libvirt: { # libvirt: {
# centos: { # centos: {
@ -28,26 +33,23 @@
# bridge_interface: "virbr0", # bridge_interface: "virbr0",
# vagrant_shared_folder: "/home/vagrant/sync", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "nfs", # sync_method: "nfs",
# kolla_path: "/home/vagrant/kolla", # username: "vagrant"
# kolla_ansible_path: "/home/vagrant/kolla-ansible"
# } # }
# }, # },
# virtualbox: { # virtualbox: {
# centos: { # centos: {
# base_image: "puppetlabs/centos-7.0-64-puppet", # base_image: "centos/7",
# bridge_interface: "wlp3s0b1", # bridge_interface: "wlp3s0b1",
# vagrant_shared_folder: "/home/vagrant/sync", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "virtualbox", # sync_method: "virtualbox",
# kolla_path: "/home/vagrant/kolla", # username: "vagrant"
# kolla_ansible_path: "/home/vagrant/kolla-ansible"
# }, # },
# ubuntu: { # ubuntu: {
# base_image: "ubuntu/wily64", # base_image: "ubuntu/xenial64",
# bridge_interface: "wlp3s0b1", # bridge_interface: "wlp3s0b1",
# vagrant_shared_folder: "/home/vagrant/sync", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "virtualbox", # sync_method: "virtualbox",
# kolla_path: "/home/vagrant/kolla", # username: "ubuntu"
# kolla_ansible_path: "/home/vagrant/kolla-ansible"
# } # }
# } # }
# } # }

2
contrib/dev/vagrant/bootstrap.sh
View File

@ -115,7 +115,7 @@ EOF
usermod -aG docker vagrant usermod -aG docker vagrant
elif is_ubuntu; then elif is_ubuntu; then
apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
echo "deb https://apt.dockerproject.org/repo ubuntu-wily main" > /etc/apt/sources.list.d/docker.list echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
apt-get -y install docker-engine apt-get -y install docker-engine
sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service

10
doc/vagrant-dev-env.rst
View File

@ -63,8 +63,14 @@ If you are going to use VirtualBox, then install vagrant-vbguest::
vagrant plugin install vagrant-vbguest vagrant plugin install vagrant-vbguest
Vagrant supports a wide range of virtualization technologies. This Vagrant supports a wide range of virtualization technologies. If VirtualBox is
documentation describes libvirt. To install vagrant-libvirt plugin:: used, the vbguest plugin will be required to install the VirtualBox Guest
Additions in the virtual machine::
vagrant plugin install vagrant-vbguest
This documentation focuses on libvirt specifics. To install vagrant-libvirt
plugin::
vagrant plugin install --plugin-version ">= 0.0.31" vagrant-libvirt vagrant plugin install --plugin-version ">= 0.0.31" vagrant-libvirt