diff options
author | grakiss <grakiss.wanglei@huawei.com> | 2016-03-09 21:55:15 -0500 |
---|---|---|
committer | Justin chi <chigang@huawei.com> | 2016-03-11 11:06:29 +0000 |
commit | 9418c59bf42d7f7c0348580e372a7ca5ddbbb1d8 (patch) | |
tree | 4c0297f2ea2fa34efa9a6cafbb82c29cc8ff9aec /deploy/adapters | |
parent | 108714f8009dc9889ff16d0acce514eb7273853f (diff) |
Improve restart duration of odl
JIRA:COMPASS-333
- restart neutron service in serial mode
- restart odl service in parallel mode
Change-Id: I95b9037d335247ac5d4d77c7e10a2109d9b4c6a6
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 6 | ||||
-rwxr-xr-x | deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml | 22 | ||||
-rw-r--r--[-rwxr-xr-x] | deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml | 22 |
3 files changed, 28 insertions, 22 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 20f1f197..96502e2d 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -215,6 +215,12 @@ serial: 1 max_fail_percentage: 0 roles: + - odl_cluster_neutron + +- hosts: all + remote_user: root + max_fail_percentage: 0 + roles: - odl_cluster_post - hosts: controller diff --git a/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml new file mode 100755 index 00000000..751a02d7 --- /dev/null +++ b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml @@ -0,0 +1,22 @@ +--- +- name: restart neutron-server + service: name=neutron-server state=restarted enabled=yes + when: inventory_hostname in groups['odl'] + +- name: add service daemon + shell: > + echo keepalived >> /opt/service ; + echo neutron-server >> /opt/service ; + when: inventory_hostname in groups['odl'] + +- name: restart neutron-l3-agent server + service: name=neutron-l3-agent state=restarted + when: inventory_hostname in groups['odl'] + +- name: restart neutron-dhcp-agent server + service: name=neutron-dhcp-agent state=restarted + when: inventory_hostname in groups['odl'] + +- name: restart neutron-metadata-agent server + service: name=neutron-metadata-agent state=restarted + when: inventory_hostname in groups['odl'] diff --git a/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml index 19e99e82..8432186c 100755..100644 --- a/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml @@ -1,26 +1,4 @@ --- -- name: restart neutron-server - service: name=neutron-server state=restarted enabled=yes - when: inventory_hostname in groups['odl'] - -- name: add service daemon - shell: > - echo keepalived >> /opt/service ; - echo neutron-server >> /opt/service ; - when: inventory_hostname in groups['odl'] - -- name: restart neutron-l3-agent server - service: name=neutron-l3-agent state=restarted - when: inventory_hostname in groups['odl'] - -- name: restart neutron-dhcp-agent server - service: name=neutron-dhcp-agent state=restarted - when: inventory_hostname in groups['odl'] - -- name: restart neutron-metadata-agent server - service: name=neutron-metadata-agent state=restarted - when: inventory_hostname in groups['odl'] - - name: restart opendaylight shell: sleep 60; service opendaylight restart; sleep 300; when: inventory_hostname in groups['odl'] |