From 52fab00daafcdec7076db43de5df59e44f428e37 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Mota Date: Thu, 13 Oct 2016 14:10:40 +0200 Subject: [PATCH] Use right parameter ipv4_gateway The external gateway is passed with the parameter gateway_ip, this ipv4_gateway was the old one, and hardcoded on the manifest. Change-Id: I0eb532bf423e45ac683fc6bf23d80699d074bd17 --- manifests/bifrost.pp | 1 - templates/bifrost/bifrost_global_vars.erb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/bifrost.pp b/manifests/bifrost.pp index 5cd623f..48bb76e 100644 --- a/manifests/bifrost.pp +++ b/manifests/bifrost.pp @@ -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, diff --git a/templates/bifrost/bifrost_global_vars.erb b/templates/bifrost/bifrost_global_vars.erb index b23a056..f1c19fd 100644 --- a/templates/bifrost/bifrost_global_vars.erb +++ b/templates/bifrost/bifrost_global_vars.erb @@ -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 %>