diff options
author | Justin chi <chigang@huawei.com> | 2015-08-22 02:20:01 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-08-22 02:20:01 +0000 |
commit | fa0b0bebe9130e71f9b41659a233b61406eab884 (patch) | |
tree | 95d8e6b4ebf4561ecfdd785966a15f8e3c0e037d /deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf | |
parent | f51b76b181bf2c6e396fecbe8088ef23e8109389 (diff) | |
parent | 444407f6ff854b9a3dfa5c7ad50e4ac6495ed9fd (diff) |
Merge "Neutron-related role in the compass-adapter should use the same template file"
Diffstat (limited to 'deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf')
-rw-r--r-- | deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf b/deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf deleted file mode 100644 index 7bcbd9df..00000000 --- a/deploy/adapters/ansible/roles/nova-controller/templates/dnsmasq-neutron.conf +++ /dev/null @@ -1,2 +0,0 @@ -dhcp-option-force=26,1454 - |