aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-31 22:58:57 -0400
committershuai chen <chenshuai@huawei.com>2016-09-02 06:35:37 +0000
commit0960913b0d973299b2d93d32d0f558ce607c5f5a (patch)
treeec9d798be3daadd94e4f37553ac21428c5452b38 /deploy/adapters/ansible/openstack_mitaka_xenial
parent863199f625819b7984ecdcd97b0f79a4ccb201a1 (diff)
bugfix: disable dlux in ODL for Centos due to conflict with ovs-openstack
JIRA: COMPASS-477 Change-Id: If9f1de6bcfde94cbb2cc3777d6ef0de78ba5ef31 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com> (cherry picked from commit 656bcf9c142e98f5fcdcc4e4eb31d277e9bed49e)
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial')
-rwxr-xr-xdeploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml12
1 files changed, 11 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
index b304b71b..4cf7948a 100755
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
@@ -89,11 +89,21 @@
- name: create karaf config
template:
- src: org.apache.karaf.features.cfg
+ src: org.apache.karaf.features.cfg.Debian
dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg"
owner: odl
group: odl
mode: 0775
+ when: ansible_os_family == "Debian"
+
+- name: create karaf config
+ template:
+ src: org.apache.karaf.features.cfg.Redhat
+ dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg"
+ owner: odl
+ group: odl
+ mode: 0775
+ when: ansible_os_family == "RedHat"
- name: create tomcat config
template: