summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-11 21:59:58 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-08-11 21:59:58 -0400
commit76291b237a0d4aedc379fc2836c2b2bbe1738298 (patch)
tree126c23dc1abca1ff060dc56e8afe59fb1a89b01f /deploy/adapters
parent0c929d196f53fe807214a392f06241cd3a6bc56c (diff)
use file inject for odl l3
JIRA: COMPASS-471 Change-Id: I88721904fe6c430b3b753277e24e2283170f7019 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf1
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/templates/nova.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index 52773598..f0bb3df0 100644
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -21,6 +21,7 @@ ec2_private_dns_show_ip=True
api_paste_config=/etc/nova/api-paste.ini
volumes_path=/var/lib/nova/volumes
enabled_apis=osapi_compute,metadata
+force_config_drive=true
default_floating_pool={{ public_net_info.network }}
auth_strategy = keystone
diff --git a/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf b/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf
index 3a5735cf..298e6f05 100644
--- a/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf
@@ -21,6 +21,7 @@ ec2_private_dns_show_ip=True
api_paste_config=/etc/nova/api-paste.ini
volumes_path=/var/lib/nova/volumes
enabled_apis=osapi_compute,metadata
+force_config_drive=true
default_floating_pool={{ public_net_info.network }}
auth_strategy = keystone