diff options
| author |   Justin chi <chigang@huawei.com> | 2017-05-04 06:35:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-04 06:35:39 +0000 |
| commit | 4352042cebbd65337f1d3f839ed11e3f7f8cba2a (patch) | |
| tree | cd3cebbe7027c29103f9f697ec79cadb2a026f08 /deploy | |
| parent | 23f50d5aeda3ff3ab96f17e04df4df7646589c58 (diff) | |
| parent | 1ea10ede18b4bacc2aca04fccb26c34976962ed7 (diff) | |
Merge "Fix vlan network can't deploy instance"
Diffstat (limited to 'deploy')
4 files changed, 4 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/dhcp_agent.ini b/deploy/adapters/ansible/roles/neutron-compute/templates/dhcp_agent.ini index 19eb62ec..4340c39c 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/templates/dhcp_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-compute/templates/dhcp_agent.ini @@ -40,7 +40,7 @@ use_namespaces = True # specific host routes to the DHCP request. The metadata service will only # be activated when the subnet does not contain any router port. The guest # instance must be configured to request host routes via DHCP (Option 121). -enable_isolated_metadata = False +enable_isolated_metadata = True # Allows for serving metadata requests coming from a dedicated metadata # access network whose cidr is 169.254.169.254/16 (or larger prefix), and diff --git a/deploy/adapters/ansible/roles/neutron-controller/templates/dhcp_agent.ini b/deploy/adapters/ansible/roles/neutron-controller/templates/dhcp_agent.ini index 19eb62ec..4340c39c 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/templates/dhcp_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-controller/templates/dhcp_agent.ini @@ -40,7 +40,7 @@ use_namespaces = True # specific host routes to the DHCP request. The metadata service will only # be activated when the subnet does not contain any router port. The guest # instance must be configured to request host routes via DHCP (Option 121). -enable_isolated_metadata = False +enable_isolated_metadata = True # Allows for serving metadata requests coming from a dedicated metadata # access network whose cidr is 169.254.169.254/16 (or larger prefix), and diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini index 19eb62ec..4340c39c 100644 --- a/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-network/templates/dhcp_agent.ini @@ -40,7 +40,7 @@ use_namespaces = True # specific host routes to the DHCP request. The metadata service will only # be activated when the subnet does not contain any router port. The guest # instance must be configured to request host routes via DHCP (Option 121). -enable_isolated_metadata = False +enable_isolated_metadata = True # Allows for serving metadata requests coming from a dedicated metadata # access network whose cidr is 169.254.169.254/16 (or larger prefix), and diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/dhcp_agent.ini b/deploy/adapters/ansible/roles/nova-controller/templates/dhcp_agent.ini index 19eb62ec..4340c39c 100644 --- a/deploy/adapters/ansible/roles/nova-controller/templates/dhcp_agent.ini +++ b/deploy/adapters/ansible/roles/nova-controller/templates/dhcp_agent.ini @@ -40,7 +40,7 @@ use_namespaces = True # specific host routes to the DHCP request. The metadata service will only # be activated when the subnet does not contain any router port. The guest # instance must be configured to request host routes via DHCP (Option 121). -enable_isolated_metadata = False +enable_isolated_metadata = True # Allows for serving metadata requests coming from a dedicated metadata # access network whose cidr is 169.254.169.254/16 (or larger prefix), and |