openstack/bifrost
Code Issues Proposed changes

Merge "Correct ipv4 networking config issue in dynamic path"

Browse Source
This commit is contained in:
Jenkins 2015-06-25 16:52:59 +00:00 committed by Gerrit Code Review
commit f2a9b2cce0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-configdrives-dynamic/templates/interfaces.j2
View File

@ -3,8 +3,6 @@ auto lo
iface lo inet loopback iface lo inet loopback
auto {{ node_default_network_interface }} auto {{ node_default_network_interface }}
iface {{ node_default_network_interface }} inet static
{% if addressing_mode is defined and "dhcp" in addressing_mode %} {% if addressing_mode is defined and "dhcp" in addressing_mode %}
iface {{ node_default_network_interface }} inet dhcp iface {{ node_default_network_interface }} inet dhcp
{% else %} {% else %}

3
playbooks/test-bifrost-dynamic.yaml
View File

@ -19,6 +19,9 @@
set_fact: set_fact:
ci_testing_zuul: true ci_testing_zuul: true
when: "'bare-trusty' in ansible_hostname" 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" - name: "Collect process list if running in OpenStack CI"
command: ps aux command: ps aux
when: ci_testing_zuul is defined when: ci_testing_zuul is defined