openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow disabling keepalived for external LBs"

Browse Source
This commit is contained in:
Zuul 2018-12-17 12:52:07 +00:00 committed by Gerrit Code Review
commit 3af135d4fb
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -417,6 +417,7 @@ openstack_interface: "admin"
# could disable some of these required roles and run their own services. # could disable some of these required roles and run their own services.
enable_glance: "yes" enable_glance: "yes"
enable_haproxy: "yes" enable_haproxy: "yes"
enable_keepalived: "{{ enable_haproxy | bool }}"
enable_keystone: "yes" enable_keystone: "yes"
enable_mariadb: "yes" enable_mariadb: "yes"
enable_memcached: "yes" enable_memcached: "yes"

2
ansible/roles/haproxy/defaults/main.yml
View File

@ -16,7 +16,7 @@ haproxy_services:
keepalived: keepalived:
container_name: keepalived container_name: keepalived
group: haproxy group: haproxy
enabled: true enabled: "{{ enable_keepalived | bool }}"
image: "{{ keepalived_image_full }}" image: "{{ keepalived_image_full }}"
privileged: True privileged: True
volumes: volumes:

3
ansible/roles/haproxy/tasks/config.yml
View File

@ -5,7 +5,8 @@
with_items: with_items:
- { name: "net.ipv4.ip_nonlocal_bind", value: 1} - { name: "net.ipv4.ip_nonlocal_bind", value: 1}
- { name: "net.unix.max_dgram_qlen", value: 128} - { name: "net.unix.max_dgram_qlen", value: 128}
when: set_sysctl | bool when:
- set_sysctl | bool
- name: Ensuring config directories exist - name: Ensuring config directories exist
file: file:

12
ansible/roles/haproxy/tasks/precheck.yml
View File

@ -11,12 +11,16 @@
changed_when: False changed_when: False
check_mode: no check_mode: no
run_once: true run_once: true
when:
- enable_keepalived | bool
- name: Create empty temp kolla_keepalived_running file - name: Create empty temp kolla_keepalived_running file
local_action: copy content=None dest=/tmp/kolla_keepalived_running mode=0644 local_action: copy content=None dest=/tmp/kolla_keepalived_running mode=0644
changed_when: False changed_when: False
check_mode: no check_mode: no
run_once: true run_once: true
when:
- enable_keepalived | bool
- name: Getting hosts who is running keepalived - name: Getting hosts who is running keepalived
local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_keepalived_running mode=0644 local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_keepalived_running mode=0644
@ -25,17 +29,21 @@
when: when:
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- container_facts['keepalived'] is defined - container_facts['keepalived'] is defined
- enable_haproxy | bool - enable_keepalived | bool
- name: Registering host running keepalived - name: Registering host running keepalived
set_fact: set_fact:
host_running_keepalived: "{{ lookup('file', '/tmp/kolla_keepalived_running') }}" host_running_keepalived: "{{ lookup('file', '/tmp/kolla_keepalived_running') }}"
when:
- enable_keepalived | bool
- name: Clearing temp kolla_keepalived_running file - name: Clearing temp kolla_keepalived_running file
local_action: file path=/tmp/kolla_keepalived_running state=absent local_action: file path=/tmp/kolla_keepalived_running state=absent
changed_when: False changed_when: False
check_mode: no check_mode: no
run_once: true run_once: true
when:
- enable_keepalived | bool
- name: Clearing temp kolla_haproxy_running file - name: Clearing temp kolla_haproxy_running file
local_action: file path=/tmp/kolla_haproxy_running state=absent local_action: file path=/tmp/kolla_haproxy_running state=absent
@ -103,6 +111,7 @@
- "{{ kolla_internal_vip_address }}" - "{{ kolla_internal_vip_address }}"
- "{{ kolla_external_vip_address }}" - "{{ kolla_external_vip_address }}"
when: when:
- enable_keepalived | bool
- "host_running_keepalived == 'None'" - "host_running_keepalived == 'None'"
- enable_haproxy | bool - enable_haproxy | bool
@ -153,6 +162,7 @@
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none) kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none)
when: when:
- enable_haproxy | bool - enable_haproxy | bool
- enable_keepalived | bool
- container_facts['keepalived'] is not defined - container_facts['keepalived'] is not defined
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']

5
releasenotes/notes/allow-disabling-keepalived-310321889a848edf.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Add a configuration option `enable_keepalived` to allow disabling the
service. This is useful when using an external LB in front of HAProxy.