bugfix for odl l3

JIRA: COMPASS-473

Change-Id: I09cff641e8485f266dead4522e07b855c01ea1de
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index f0bb3df..5277359 100644 (file)
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -21,7 +21,6 @@ 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 298e6f0..3a5735c 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack_mitaka/templates/nova.conf
@@ -21,7 +21,6 @@ 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/roles/odl_cluster/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
index 441ec2e..a917a76 100755 (executable)
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml
@@ -19,3 +19,6 @@
   include: openvswitch.yml
   when: groups['odl']|length !=0 and inventory_hostname not in groups['odl']
 
+- name: Config nova
+  include: odl_l3_nova.yml
+  when: groups['odl']|length !=0 and odl_l3_agent == "Enable"

diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_l3_nova.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_l3_nova.yml
new file mode 100644 (file)
index 0000000..4e53f4a
--- /dev/null
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_l3_nova.yml
@@ -0,0 +1,15 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+
+- name: set file inject in nova.conf
+  shell: crudini --set /etc/nova/nova.conf DEFAULT force_config_drive true
+
+- name: restart all nova service
+  shell: for i in `cat /opt/service | grep nova` ; do service $i restart; done