From: chenshuai@huawei.com Date: Fri, 12 Aug 2016 01:59:58 +0000 (-0400) Subject: use file inject for odl l3 X-Git-Tag: colorado.1.0~39 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=76291b237a0d4aedc379fc2836c2b2bbe1738298;p=compass4nfv.git use file inject for odl l3 JIRA: COMPASS-471 Change-Id: I88721904fe6c430b3b753277e24e2283170f7019 Signed-off-by: chenshuai@huawei.com --- 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