summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-31 22:58:57 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-08-31 22:58:57 -0400
commit656bcf9c142e98f5fcdcc4e4eb31d277e9bed49e (patch)
tree4977ff9795c55831ce1d85e7f27c5b5c7a031140 /deploy/adapters/ansible/openstack_mitaka_xenial/roles
parente09136c215f9166a98ced9bcced6e068a3ed73d4 (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>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles')
-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: