diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-09-06 07:10:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-06 07:10:04 +0000 |
| commit | afc3c2a4cb16b7fd29c1ceec6c4b7f566767dc6b (patch) | |
| tree | 9373b500d2135de4dff444317d8f62b1fe34d7d3 /xci | |
| parent | b0eb8e17350baf0b6d71045c7ec5fbfead6560f6 (diff) | |
| parent | 0701ea9d39e4bcbf7cb7733cadfdab79b6e266b2 (diff) | |
Merge "xci: infra: bifrost: Allow DNS overrides"
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/infra/bifrost/playbooks/opnfv-virtual.yml | 6 |
1 files 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 |