From 1343165ebb1431718e2c91323d97908cc5cb5760 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 19 Sep 2016 12:51:46 +0300 Subject: [PATCH] update index and vagrant refs Change-Id: I000bb1ca4481e88c0e7064638797b0ebbe0793af --- README.rst | 8 ++++---- doc/source/index.rst | 1 + doc/source/vagrant.rst | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index d127231..be123a8 100644 --- a/README.rst +++ b/README.rst @@ -29,11 +29,11 @@ Vagrant Vagrant support is limited at this time. Try it and report bugs if you see any! Using VirtualBox +================ :: vagrant up --provider virtualbox Using Libvirt -:: -sudo sh -c 'echo 0 > /proc/sys/net/bridge/bridge-nf-call-iptables' -vagrant plugin --install vagrant-libvirt -vagrant up --provider libvirt +============= + +See [Vagrant libvirt guide](doc/source/vagrant.rst) diff --git a/doc/source/index.rst b/doc/source/index.rst index 5b8637b..30b2351 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -17,6 +17,7 @@ Contents vagrant troubleshooting inventory_repo + generate_inventory packer collect_info diff --git a/doc/source/vagrant.rst b/doc/source/vagrant.rst index d47ec62..e800f40 100644 --- a/doc/source/vagrant.rst +++ b/doc/source/vagrant.rst @@ -14,3 +14,6 @@ To start with defaults, just run ``vagrant up``. To tweak defaults, see the .. note:: Make sure the default network choice doesn't conflict with existing host networks! +.. note:: If you are running on Ubuntu Xenial, you may need to run the + following command: ``sudo sh -c 'echo 0 > /proc/sys/net/bridge/bridge-nf-call-iptables'`` + or else container networking will be broken.