opendev
/
puppet-infracloud
Code Issues Proposed changes

Merge "Use right parameter ipv4_gateway"

This commit is contained in:
Jenkins 2016-10-14 09:00:32 +00:00 committed by Gerrit Code Review
parent ea4520e741 52fab00daa
commit 374218ac1a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/bifrost.pp
View File

@ -27,7 +27,6 @@ class infracloud::bifrost (
$dhcp_pool_end = '10.10.16.190',
$dhcp_static_mask = '255.255.255.0',
$network_interface = 'eth2',
$ipv4_gateway = '15.184.64.1',
$ipv4_nameserver = '8.8.8.8',
$ipv4_subnet_mask = '255.255.224.0',
$dib_dev_user_password = undef,

2
templates/bifrost/bifrost_global_vars.erb
View File

@ -3,7 +3,7 @@ node_default_network_interface: <%= @default_network_interface %>
node_network_info: "{}"
disable_dnsmasq_dns: true
ipv4_subnet_mask: <%= @ipv4_subnet_mask %>
ipv4_gateway: <%= @ipv4_gateway %>
ipv4_gateway: <%= @gateway_ip %>
ipv4_nameserver: <%= @ipv4_nameserver %>
vlan_id: <%= @vlan %>
dhcp_pool_start: <%= @dhcp_pool_start %>