diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-09-04 14:38:56 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-09-04 14:43:31 -0400 |
| commit | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (patch) | |
| tree | 0970daa3d2c30f93fe6aa40cfbfb63549e5182d6 /compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf | |
| parent | ab4950db472c20b57bff533f1f330b5b794aa35b (diff) | |
| parent | 591a1c4327c0793b4a15443f9e72b79ffbeaa226 (diff) | |
Merge branch 'master' into merge-master-arno
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf')
| -rw-r--r-- | compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf b/compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf new file mode 100644 index 0000000..7bcbd9d --- /dev/null +++ b/compass/deploy/ansible/roles/neutron-controller/templates/dnsmasq-neutron.conf @@ -0,0 +1,2 @@ +dhcp-option-force=26,1454 + |