summaryrefslogtreecommitdiffstats
path: root/foreman/ci/Vagrantfile
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-06-26 11:49:42 -0400
committerTim Rozet <trozet@redhat.com>2015-07-06 15:44:34 -0400
commit9ff324952808fa85b6c897b496b332ef76f92441 (patch)
treeb013f77099d57711626e1c4b0748ceb6b7fe24e8 /foreman/ci/Vagrantfile
parentbf5b9331cd860d0622d4eeab3093e8dced15188e (diff)
Fixes networking related constraints for Virtual deployments
Patchset fixes the following: - Virtual deployment no longer requires 3 networks, does a lookup of the public interface on the server to bridge to, and then uses internal VirtualBox networks for the other admin and private networks - enable_virtual_dhcp option now allows enabling of Foreman DHCP server. This new default behavior is to use static IP address in virtual deployments. This is more useful in environments where disabling DHCP on the public network is not an option. - static_ip_range argument used to define which IP block to use out of the public network for the deployment. Valid only in virtual deployment. - puppet verification for virtual deployments added - horizon and foreman URLs will now be printed at the end of deployment - fixes and updates to non-HA deployments - ping_site argument now allows users to specify the site to verify VM internet connectivity. Default is google.com which is unreachable in China JIRA: BGS-73 Change-Id: I63b4c91477591d2f9436b5e6f59a2f2ee021d7d7 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'foreman/ci/Vagrantfile')
-rw-r--r--foreman/ci/Vagrantfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/foreman/ci/Vagrantfile b/foreman/ci/Vagrantfile
index 100e12d..a01da70 100644
--- a/foreman/ci/Vagrantfile
+++ b/foreman/ci/Vagrantfile
@@ -41,6 +41,9 @@ Vagrant.configure(2) do |config|
default_gw = ""
nat_flag = false
+ # Disable dhcp flag
+ disable_dhcp_flag = false
+
# Share an additional folder to the guest VM. The first 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
@@ -90,4 +93,8 @@ Vagrant.configure(2) do |config|
config.vm.provision :shell, path: "nat_setup.sh"
end
config.vm.provision :shell, path: "bootstrap.sh"
+ if disable_dhcp_flag
+ config.vm.provision :shell, :inline => "systemctl stop dhcpd"
+ config.vm.provision :shell, :inline => "systemctl disable dhcpd"
+ end
end