summaryrefslogtreecommitdiffstats
path: root/xci/infra
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-28 21:04:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-28 21:04:31 +0000
commit455ea6c732384de5616be9c8c5cb006ae38e6716 (patch)
tree40b9b856c82a859c597d6def40d69ff2647518ce /xci/infra
parentefc57cd6b442eb16cddd1f383591aba87f72694d (diff)
parent13d46ccfd5cabbc8b07db5c447a2d5f5feadbeb9 (diff)
Merge "xci: bifrost: Only use libvirt as DNS server if using proxy servers"
Diffstat (limited to 'xci/infra')
-rw-r--r--xci/infra/bifrost/playbooks/opnfv-virtual.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yaml b/xci/infra/bifrost/playbooks/opnfv-virtual.yaml
index 3429f2e6..bb0daff6 100644
--- a/xci/infra/bifrost/playbooks/opnfv-virtual.yaml
+++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yaml
@@ -109,11 +109,15 @@
become: no
connection: local
gather_facts: yes
+ pre_tasks:
+ - name: "Override default bifrost DNS if we are behind a proxy"
+ set_fact:
+ ipv4_nameserver: "192.168.122.1"
+ when: lookup('env','http_proxy') != ''
roles:
- role: ironic-enroll-dynamic
- { role: ironic-inspect-node, when: inspect_nodes | default('false') | bool == true }
- role: bifrost-configdrives-dynamic
- ipv4_nameserver: 192.168.122.1
- role: bifrost-deploy-nodes-dynamic
environment:
http_proxy: "{{ lookup('env','http_proxy') }}"