opendev
/
puppet-infracloud
Code Issues Proposed changes

Start parameterizing the network config in bifrost 

This doesn't have to be hardcoded in the module, but
parameterized, and ideally shall be configured using
hiera. As an initial step, add the parameters with
default values, to pass tests until the corresponding
change for system-config lands.

Change-Id: Ic1f0368a1cb6c94405a4cb52dec1b83131164035
This commit is contained in:
Yolanda Robla Mota 2016-09-16 16:07:22 +02:00
parent d7040706ba
commit 70f4c4f19e
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/bifrost.pp
View File

@ -21,6 +21,14 @@ class infracloud::bifrost (
$ssh_private_key,
$ssh_public_key,
$vlan,
$default_network_interface = 'eth2',
$dhcp_pool_start = '10.10.16.144',
$dhcp_pool_end = '10.10.16.190',
$network_interface = 'eth2',
$ipv4_gateway = '15.184.64.1',
$ipv4_nameserver = '8.8.8.8',
$ipv4_subnet_mask = '255.255.224.0',
) {
include ::infracloud::params

16
templates/bifrost/bifrost_global_vars.erb
View File

@ -1,13 +1,13 @@
network_interface: eth2
node_default_network_interface: eth2
network_interface: <%= @network_interface %>
node_default_network_interface: <%= @default_network_interface %>
node_network_info: "{}"
disable_dnsmasq_dns: true
ipv4_subnet_mask: 255.255.224.0
ipv4_gateway: 15.184.64.1
ipv4_nameserver: 8.8.8.8
vlan_id: 2551
dhcp_pool_start: 10.10.16.144
dhcp_pool_end: 10.10.16.190
ipv4_subnet_mask: <%= @ipv4_subnet_mask %>
ipv4_gateway: <%= @ipv4_gateway %>
ipv4_nameserver: <%= @ipv4_nameserver %>
vlan_id: <%= @vlan %>
dhcp_pool_start: <%= @dhcp_pool_start %>
dhcp_pool_end: <%= @dhcp_pool_end %>
inventory_dhcp: true
inventory_dhcp_static_ip: true
dib_os_element: "ubuntu-minimal"