From 0701ea9d39e4bcbf7cb7733cadfdab79b6e266b2 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 31 Aug 2018 10:34:56 +0100 Subject: xci: infra: bifrost: Allow DNS overrides Deployers may want to use a different DNS server so allow them to override the ipv4_nameserver option. If the variable is not set, then we use the libvirt DNS if we are behind a proxy, otherwise we default to the Google DNS. Change-Id: I96cf63758902d4aae3d155b2e8beef650449ebc9 Signed-off-by: Markos Chandras --- xci/infra/bifrost/playbooks/opnfv-virtual.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yml b/xci/infra/bifrost/playbooks/opnfv-virtual.yml index 68d76cfc..abac7ba2 100644 --- a/xci/infra/bifrost/playbooks/opnfv-virtual.yml +++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yml @@ -128,10 +128,6 @@ setup: delegate_to: opnfv delegate_facts: False - - name: "Override default bifrost DNS if we are behind a proxy" - set_fact: - ipv4_nameserver: "192.168.122.1" - when: lookup('env','http_proxy') != '' - name: Find network interface in the OPNFV node set_fact: network_interface: "{{ ansible_default_ipv4.interface }}" @@ -147,6 +143,8 @@ - import_role: name: bifrost-configdrives-dynamic private: True + vars: + ipv4_namesever: "{{ ipv4_nameserver | ((lookup('env','http_proxy') != '') | ternary('192.168.122.1', '8.8.8.8')) }}" delegate_to: opnfv - import_role: name: bifrost-deploy-nodes-dynamic -- cgit 1.2.3-korg