summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-20 03:26:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-20 03:26:57 +0000
commit43be0ce19bab98c7b7a1af0e67f63ec1286fd93c (patch)
tree51b34382a8b9d62ff194d2f294b1156f3e3a2eb1
parent8cc4c6b7cd58198e05b2eafadb0473a35078a505 (diff)
parent2cb30ff0ed49b6b7adac12e83b2965e90b1d177b (diff)
Merge "disable odl l3 for Centos"
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml8
1 files changed, 7 insertions, 1 deletions
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 51093236..15513b30 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -197,7 +197,13 @@
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"
+ when: odl_l3_agent == "Enable" and ansible_os_family == "Debian"
+
+- name: remove neutron-l3-agent daemon
+ shell: >
+ sed -i 'neutron-l3-agent/d' /opt/service ;
+ mv /lib/systemd/system/neutron-l3-agent.service /home/ ;
+ when: odl_l3_agent == "Enable" and ansible_os_family == "RedHat"
####################################################
- name: chown opendaylight directory and files