diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-25 16:54:54 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-25 09:45:52 +0000 |
| commit | ab4fb9101b705a13da6228e8221ac120f5ee0484 (patch) | |
| tree | bddf41730ff7c39e21fc622cdc4a9751f089e59f | |
| parent | e30859a707dad0d43292374aeb346e5044e3be8b (diff) | |
bugfix: odl cluster function problem
JIRA:COMPASS-285
Change-Id: I78eebc04576141dc48961e0beeb9408b28b10793
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit efa46a5b06c8c138aadbf396f6431acd7b606ed9)
3 files changed, 39 insertions, 12 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml index 1eb517b8..3bb9d9be 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml @@ -9,4 +9,6 @@ include: openvswitch.yml when: groups['odl']|length !=0 and inventory_hostname not in groups['odl'] - +- name: Wait 5 minutes after odl deployment + shell: sleep 300 + when: groups['odl']|length !=0 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 147338c7..6d43b9ef 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -95,22 +95,22 @@ ########################################################################################################## ################################# OpenDayLight Cluster Configuration ################################# ########################################################################################################## -- name: create initial directory - shell: > - mkdir -p {{ odl_home }}/configuration/initial; +#- name: create initial directory +# shell: > +# mkdir -p {{ odl_home }}/configuration/initial; -- name: create akka config - template: - src: akka.conf - dest: "{{ odl_home }}/configuration/initial/akka.conf" +#- name: create akka config +# template: +# src: akka.conf +# dest: "{{ odl_home }}/configuration/initial/akka.conf" # notify: # - restart odl service -- name: create module-shards config - template: - src: module-shards.conf - dest: "{{ odl_home }}/configuration/initial/module-shards.conf" +#- name: create module-shards config +# template: +# src: module-shards.conf +# dest: "{{ odl_home }}/configuration/initial/module-shards.conf" # notify: # - restart odl service diff --git a/deploy/conf/virtual_cluster_opencontrail.yml b/deploy/conf/virtual_cluster_opencontrail.yml new file mode 100644 index 00000000..56240f35 --- /dev/null +++ b/deploy/conf/virtual_cluster_opencontrail.yml @@ -0,0 +1,25 @@ +TYPE: virtual +FLAVOR: cluster + +hosts: + - name: host1 + roles: + - controller + - ha + - opencontrail + + - name: host2 + roles: + - compute + + - name: host3 + roles: + - compute + + - name: host4 + roles: + - compute + + - name: host5 + roles: + - compute |