From 5bd90bab015df29d0cbda07f12ad77f1b06c44ef Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 19 Jun 2015 14:08:27 -0400 Subject: [PATCH] Correct ipv4 networking config issue in dynamic path A syntax error in a template file coupled with the incorect ipv4_gateway being set when testing resulted in Cirros being unable to get a working network interface online. This corrects the template and addresses the ipv4_gateway default when using the test playbook. Change-Id: I7155de8ec9a4123e16a9f9925a66ee12adfc9c28 --- .../roles/bifrost-configdrives-dynamic/templates/interfaces.j2 | 2 -- playbooks/test-bifrost-dynamic.yaml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/bifrost-configdrives-dynamic/templates/interfaces.j2 b/playbooks/roles/bifrost-configdrives-dynamic/templates/interfaces.j2 index c9d3e0df9..2a9d03195 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/templates/interfaces.j2 +++ b/playbooks/roles/bifrost-configdrives-dynamic/templates/interfaces.j2 @@ -3,8 +3,6 @@ auto lo iface lo inet loopback auto {{ node_default_network_interface }} -iface {{ node_default_network_interface }} inet static - {% if addressing_mode is defined and "dhcp" in addressing_mode %} iface {{ node_default_network_interface }} inet dhcp {% else %} diff --git a/playbooks/test-bifrost-dynamic.yaml b/playbooks/test-bifrost-dynamic.yaml index 752e1784c..073ffbbd5 100644 --- a/playbooks/test-bifrost-dynamic.yaml +++ b/playbooks/test-bifrost-dynamic.yaml @@ -19,6 +19,9 @@ set_fact: ci_testing_zuul: true when: "'bare-trusty' in ansible_hostname" + - name: "Override the ipv4_gateway setting" + set_fact: + ipv4_gateway: "192.168.122.1" - name: "Collect process list if running in OpenStack CI" command: ps aux when: ci_testing_zuul is defined