diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
| commit | 3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7 (patch) | |
| tree | 4875e396af3ef083ee6883775e34c48e52605e2d /openstack/usr/share/openstack/extras/60-device-dhcp.network | |
| parent | c368f61b0b460f120634219a5b70186c803d5bed (diff) | |
| parent | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (diff) | |
| download | infrastructure-3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7.tar.gz | |
Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2
Conflicts:
baserock_irclogs/systems/irclogs-x86_64.morph
hosts
scripts/licensecheck.pl
Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f
Diffstat (limited to 'openstack/usr/share/openstack/extras/60-device-dhcp.network')
| -rw-r--r-- | openstack/usr/share/openstack/extras/60-device-dhcp.network | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openstack/usr/share/openstack/extras/60-device-dhcp.network b/openstack/usr/share/openstack/extras/60-device-dhcp.network new file mode 100644 index 00000000..6fdbfd8d --- /dev/null +++ b/openstack/usr/share/openstack/extras/60-device-dhcp.network @@ -0,0 +1,5 @@ +[Match] +Name={{ item }} + +[Network] +DHCP=yes |