diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-08-16 10:55:04 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-08-18 11:30:37 +0800 |
| commit | 0ebcf5e461c5cecfb23b4497d8966485fd504c55 (patch) | |
| tree | d2a5af44161f39c0557482c18518f3366d1187bf /deploy/adapters/ansible/roles | |
| parent | 5f2c78057f1a15ca90c5c25025f713a56a48dfc6 (diff) | |
support the noha scenario
1. add parameter to install keepalived when only one controller
2. change the osa code to start keepalived and haproxy
3. add the noha DHA files
4. fix the setup ovs bug
5. fix the pod1 public vip
Change-Id: I19f4e78b9ca834ae3d454e1c8058728ece055f69
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles')
3 files changed, 28 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml index e906ed45..ed631036 100644 --- a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml +++ b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml @@ -30,9 +30,8 @@ - name: change the openvswitch_agent.ini lineinfile: dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini + state: absent regexp: '^bridge_mappings' - insertafter: '^bridge_mappings' - line: "local_ip = {{hostvars[inventory_hostname]['ansible_br_tenant']['ipv4']['address']}}" notify: - Restart neutron-openvswitch-agent when: diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index cd1e90e9..a96e62ce 100644 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -83,7 +83,7 @@ src: user_ceph.yml dest: /etc/openstack_deploy/user_ceph.yml when: - - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] |length > 0 }}" + - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}" - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}" - name: render ceph.yml.j2 @@ -91,7 +91,7 @@ src: ceph.yml.j2 dest: /etc/openstack_deploy/conf.d/ceph.yml when: - - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] |length > 0 }}" + - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}" - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}" - name: render user_variables_ceph.yml.j2 @@ -99,5 +99,10 @@ src: user_variables_ceph.yml.j2 dest: /etc/openstack_deploy/user_variables_ceph.yml when: - - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] |length > 0 }}" + - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}" - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}" + +- name: adapt no ha scenario + include: noha.yml + when: + - "{{ hostvars[inventory_hostname]['groups']['controller'] | length < 2 }}" diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/noha.yml b/deploy/adapters/ansible/roles/config-osa/tasks/noha.yml new file mode 100644 index 00000000..3f134099 --- /dev/null +++ b/deploy/adapters/ansible/roles/config-osa/tasks/noha.yml @@ -0,0 +1,19 @@ +# ############################################################################# +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +- name: disable kernel update in rt_kvm scenario + lineinfile: + dest: /etc/openstack_deploy/user_variables.yml + line: 'haproxy_use_keepalived: "True"' + +- name: disable kernel update in rt_kvm scenario + lineinfile: + dest: /opt/openstack-ansible/playbooks/vars/configs/keepalived_haproxy.yml + state: absent + regexp: '- haproxy_check_script' |