diff options
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' |