stackforge/packstack-vagrant
Code Issues Proposed changes

Do not enable proxy by default and extend proxy documentation

Browse Source 
Change-Id: I80269d6a48eba9bf2ac8012aedf68efba70315c1
This commit is contained in:
Christian Berendt
2015-01-07 13:20:26 +01:00
parent 9bf04f5097
commit 5b68c5f03e
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml.sample
View File

@@ -9,8 +9,8 @@ network_type: gre
netmask_internal: 255.255.0.0 netmask_internal: 255.255.0.0
proxy: proxy:
address: 'http://proxy.company.site:3128' address: 'http://proxy.company.site:3128'
install: true install: false
use: true use: false
storage_backend: nfs storage_backend: nfs
address: address:
controller: 10.100.50.10 controller: 10.100.50.10

29
doc/source/configuration.rst
View File

@@ -125,21 +125,28 @@ configures a HTTP proxy to be used by ``yum``.
$ vagrant plugin install vagrant-proxyconf $ vagrant plugin install vagrant-proxyconf
When the plugin is installed caching/proxying is enabled by default and the When the plugin is installed caching/proxying is not enabled by default. To
HTTP proxy `Squid <http://www.squid-cache.org/>`__ will be installed on the enable caching/proxying set ``use`` to ``true``.
controller node.
``address`` has to point to an existing HTTP proxy server (e.g.
``http://proxy.company.site:3128``).
:: ::
proxy: proxy:
use: true use: true
install: false
address: 'http://proxy.company.site:3128' address: 'http://proxy.company.site:3128'
To install the HTTP proxy `Squid <http://www.squid-cache.org/>`__ on the
controller node set ``install`` to ``true``.
To use the local proxy set ``use`` to ``true``. ``address`` has not to
be set when installing Squid on the controller node. ``address`` will be
overwritten when installing Squid as local HTTP proxy.
::
proxy:
install: true install: true
use: true
To explicitly disable caching/proxying when ``vagrant-proxyconf`` is installed
set ``use`` to ``false``.
To skip the installation of Squid on the controller node set ``install``
to ``false``. ``address`` has to point to an existing HTTP proxy server (e.g.
``http://proxy.company.site:3128``) when Squid is not installed. ``address``
has not to be set when installing Squid on the controller node.