summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles')
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/main.yml3
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml13
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/odl_l3_nova.yml15
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml2
4 files changed, 32 insertions, 1 deletions
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_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
index 5c9b203e..51093236 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -187,6 +187,19 @@
service: name=keepalived state=stopped
when: ansible_os_family == "Debian"
+################ l3 agent remove ###################
+- name: turn off neutron-l3-agent on control node
+ service: name=neutron-l3-agent state=stopped
+ when: odl_l3_agent == "Enable"
+
+- name: remove neutron-l3-agent daemon
+ shell: >
+ sed -i 'neutron-l3-agent/d' /opt/service ;
+ mv /etc/init.d/neutron-l3-agent /home/ ;
+ mv /etc/init/neutron-l3-agent.conf /home/ ;
+ when: odl_l3_agent == "Enable"
+####################################################
+
- name: chown opendaylight directory and files
shell: >
chown -R odl:odl "{{ odl_home }}";
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
diff --git a/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml
index 751a02d7..3024dcf1 100755
--- a/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml
@@ -11,7 +11,7 @@
- name: restart neutron-l3-agent server
service: name=neutron-l3-agent state=restarted
- when: inventory_hostname in groups['odl']
+ when: inventory_hostname in groups['odl'] and odl_l3_agent == "Disable"
- name: restart neutron-dhcp-agent server
service: name=neutron-dhcp-agent state=restarted