openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Fixes too low security group rules quota

Browse Source 
The quota for security group rules was erroneously set
to 100 with the aim to have 100 security group rules
per security group instead of to 100*#security group rules.
This patch fixes this discrepancy.

It also uses the int filter to avoid string mis-
interpretation.

Change-Id: Iafd15276524988e7240a26a1f362593c05529931
(cherry picked from commit b2d820d3fc19514b2827599a563066b9ec276702)
This commit is contained in:
German Eichberger 2018-09-07 10:50:02 -07:00 committed by Jesse Pretorius (odyssey4me)
parent 41eb1ff4e2
commit 88225a2f28
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
defaults/main.yml
View File

@ -444,13 +444,13 @@ octavia_signing_digest: sha256
# Quotas for the Octavia user - assuming active/passive topology
octavia_num_instances: 10000 # 5000 LB in active/passive
octavia_ram: "{{ octavia_num_instances*1024 }}"
octavia_num_server_groups: "{{ (octavia_num_instances*0.5)|int|abs }}"
octavia_ram: "{{ (octavia_num_instances|int)*1024 }}"
octavia_num_server_groups: "{{ ((octavia_num_instances|int)*0.5)|int|abs }}"
octavia_num_server_group_members: 50
octavia_num_cores: "{{ octavia_num_instances }}"
octavia_num_secgroups: "{{ octavia_num_instances*1.5|int|abs}}" # average 3 listener per lb
octavia_num_ports: "{{ octavia_num_instances*10 }}" # at least instances * 10
octavia_num_security_group_rules: 100
octavia_num_secgroups: "{{ (octavia_num_instances|int)*1.5|int|abs }}" # average 3 listener per lb
octavia_num_ports: "{{ (octavia_num_instances|int)*10 }}" # at least instances * 10
octavia_num_security_group_rules: "{{ (octavia_num_secgroups|int)*100 }}"
## Tunable overrides
octavia_octavia_conf_overrides: {}

8
releasenotes/notes/fixes_sec_grp_rule_quota-2755da6c2c2ab434.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
The quota for security group rules was erroneously set
to 100 with the aim to have 100 security group rules
per security group instead of to 100*#security group rules.
This patch fixes this discrepancy.

2
tasks/octavia_security_group.yml
View File

@ -39,7 +39,7 @@
--server-group-members {{ octavia_num_server_group_members }}
--secgroups {{ octavia_num_secgroups }}
--ports {{ octavia_num_ports }}
--secgroup-rules {{ octavia_num_secgroups }}
--secgroup-rules {{ octavia_num_security_group_rules }}
{{ octavia_service_project_name }}
tags:
- skip_ansible_lint