From e5f4a56fc69f25f1c0753dcbd56c418fcae49c7a Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 11 Aug 2016 22:13:59 -0400 Subject: bugfix for odl l3 JIRA: COMPASS-473 Change-Id: I09cff641e8485f266dead4522e07b855c01ea1de Signed-off-by: chenshuai@huawei.com --- deploy/adapters/ansible/openstack/templates/nova.conf | 1 - .../adapters/ansible/openstack_mitaka/templates/nova.conf | 1 - deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml | 3 +++ .../ansible/roles/odl_cluster/tasks/odl_l3_nova.yml | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 deploy/adapters/ansible/roles/odl_cluster/tasks/odl_l3_nova.yml (limited to 'deploy/adapters/ansible') diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf index f0bb3df0..52773598 100644 --- 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 298e6f05..3a5735cf 100644 --- 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 441ec2e2..a917a769 100755 --- 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 index 00000000..4e53f4aa --- /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 -- cgit 1.2.3-korg