Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

task: pass through exclusive tenant tag #241

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+34 −4
Open

task: pass through exclusive tenant tag #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99e5207
task: pass through exclusive tenant tag
aaronkvanmeerten Aug 10, 2023
70d9f71
always set exclusive_tenant meta
aaronkvanmeerten Aug 10, 2023
0f3cf6d
consul template for exclusive_tenant
aaronkvanmeerten Aug 10, 2023
9483723
include exclusive_tenant sorting in old haproxy configuration
aaronkvanmeerten Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/configure-core-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
become: true
force_handlers: true
vars:
exclusive_tenant: ""
shard_role: core
cloud_provider: aws
core_public_ip: "{{ oracle_public_ip | default('') if core_cloud_provider == 'oracle' else ansible_ec2_public_ipv4 | default('') }}"
Expand Down
8 changes: 7 additions & 1 deletion ansible/roles/common/files/oracle_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export NAME_TAG="Name"
export SHARD_TAG="shard"
export SHARD_ROLE_TAG="shard-role"
export GIT_BRANCH_TAG="git_branch"
export EXCLUSIVE_TENANT_TAG="exclusive_tenant"
export RELEASE_NUMBER_TAG="release_number"
export JIBRI_RELEASE_NUMBER_TAG="jibri_release_number"
export JVB_RELEASE_NUMBER_TAG="jvb_release_number"
Expand Down Expand Up @@ -88,6 +89,7 @@ export ENVIRONMENT=$(cat $CACHE_PATH | jq -r --arg ENVIRONMENT_TAG "$ENVIRONMENT
export ENVIRONMENT_TYPE=$(cat $CACHE_PATH | jq -r --arg ENVIRONMENT_TYPE_TAG "$ENVIRONMENT_TYPE_TAG" ".[\"$ENVIRONMENT_TYPE_TAG\"]")
export SHARD=$(cat $CACHE_PATH | jq -r --arg SHARD_TAG "$SHARD_TAG" ".[\"$SHARD_TAG\"]")
export SHARD_ROLE=$(cat $CACHE_PATH | jq -r --arg SHARD_ROLE_TAG "$SHARD_ROLE_TAG" ".[\"$SHARD_ROLE_TAG\"]")
export EXCLUSIVE_TENANT=$(cat $CACHE_PATH | jq -r --arg EXCLUSIVE_TENANT_TAG "$EXCLUSIVE_TENANT_TAG" ".[\"$EXCLUSIVE_TENANT_TAG\"]")
export RELEASE_NUMBER=$(cat $CACHE_PATH | jq -r --arg RELEASE_NUMBER_TAG "$RELEASE_NUMBER_TAG" ".[\"$RELEASE_NUMBER_TAG\"]")
export JIBRI_RELEASE_NUMBER=$(cat $CACHE_PATH | jq -r --arg JIBRI_RELEASE_NUMBER_TAG "$JIBRI_RELEASE_NUMBER_TAG" ".[\"$JIBRI_RELEASE_NUMBER_TAG\"]")
export JVB_RELEASE_NUMBER=$(cat $CACHE_PATH | jq -r --arg JVB_RELEASE_NUMBER_TAG "$JVB_RELEASE_NUMBER_TAG" ".[\"$JVB_RELEASE_NUMBER_TAG\"]")
Expand Down Expand Up @@ -127,4 +129,8 @@ fi

if [ "$JVB_POOL_MODE" == "null" ]; then
export JVB_POOL_MODE=
fi
fi

if [ "$EXCLUSIVE_TENANT" == "null" ]; then
export EXCLUSIVE_TENANT=
fi
1 change: 1 addition & 0 deletions ansible/roles/consul-signal/templates/signal.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"environment":"{{ hcv_environment }}",
"domain":"{{ prosody_domain_name }}",
"release_number":"{{ jitsi_release_number }}",
"exclusive_tenant":"{{ exclusive_tenant }}",
"shard":"{{ shard_name }}",
"shard_id":"{{ shard_number }}",
"http_backend_port":"443",
Expand Down
5 changes: 5 additions & 0 deletions ansible/roles/hcv-haproxy-configure/files/configure-haproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ def backend_from_service(consul_url,service,datacenter,local_datacenters):
if 'http_backend_port' in service['ServiceMeta']:
backend_port = int(service['ServiceMeta']['http_backend_port'])

exclusive_tenant = ''
if 'exclusive_tenant' in service['ServiceMeta']:
exclusive_tenant = service['ServiceMeta']['exclusive_tenant']

if 'ServiceTaggedAddresses' in service:
if 'lan' in service['ServiceTaggedAddresses']:
private_ip = service['ServiceTaggedAddresses']['lan']['Address']
Expand Down Expand Up @@ -154,6 +158,7 @@ def backend_from_service(consul_url,service,datacenter,local_datacenters):
'agent_port': agent_port,
'backend_port': backend_port,
'release_number': release_number,
'exclusive_tenant': exclusive_tenant,
}

if backend['datacenter'] in local_datacenters:
Expand Down
18 changes: 16 additions & 2 deletions ansible/roles/hcv-haproxy-configure/templates/haproxy.cfg.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,22 @@ backend release-{{ release }}
{%- endif %}
{% endfor %}
{% for item in haproxy_facts.backends|sort(attribute='local',reverse=True) %}
{% if item['release_number'] != release %}
{% if item['release_number'] != release and item['exclusive_tenant'] == "" %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the new logic for when the item['exclusive_tenant'] != "" not item['exclusive_tenant'] == "" ?
I don't completely understand it, that's why I'm not sure

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have replaced one loop for two. Previously, we'd loop on all shards in releases that don't match the current one. Now we loop on all shards that don't match the current release and don't have an exclusive tenancy. Then we go back and loop again and include any that have an exclusive tenancy but aren't part of the current release.

server {{ release }}-fallback-{{ item['shard'] }} {% if haproxy_backend_use_private_ip -%}
{{ item['private_ip'] }}
{%- else -%}
{{ item['public_ip'] }}
{%- endif -%}
:{{ item['backend_port'] if item['backend_port'] is defined else haproxy_backend_port }} id {{ item['id'] }} backup
{%- if (item['backend_port'] if item['backend_port'] is defined else haproxy_backend_port)==443 %} ssl verify none {% endif -%}
{% if haproxy_agent_check -%} no-check agent-check agent-port {{ item['agent_port'] if item['agent_port'] is defined else haproxy_agent_check_port }} agent-inter {{ haproxy_check_interval }} weight 256
{%- elif haproxy_check_port -%}
{%- if haproxy_check_port==443 %} check-ssl {% endif -%} check port {{ haproxy_check_port }}
{%- endif %}
{%- endif %}
{% endfor %}
{% for item in haproxy_facts.backends|sort(attribute='local',reverse=True) %}
{% if item['release_number'] != release and item['exclusive_tenant'] != "" %}
server {{ release }}-fallback-{{ item['shard'] }} {% if haproxy_backend_use_private_ip -%}
{{ item['private_ip'] }}
{%- else -%}
Expand All @@ -417,5 +432,4 @@ backend release-{{ release }}
{%- endif %}
{%- endif %}
{% endfor %}

{% endfor %} {# haproxy_facts.releases #}
5 changes: 4 additions & 1 deletion ansible/roles/hcv-haproxy-configure/templates/haproxy.cfg.template.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,9 @@ backend release-{{ $release }}
stick on hdr(X-StickToken) table {{ haproxy_backend_name }} if stick_token_flag stick_token
{% for dc in ns.haproxy_datacenters %}{% raw %}{{ $dc_shards := print "signal@{% endraw %}{{ dc }}{% raw %}" }}{{ range $index, $shard := service $dc_shards }}{{ if eq $shard.ServiceMeta.release_number $release }}
server {{ $release }}-{{ $shard.ServiceMeta.shard }} {{ $shard.Address }}:{{ $shard.ServiceMeta.http_backend_port }} id {{ $shard_int := $shard.ServiceMeta.shard_id | parseInt }}{{ add $shard_int 10 }}{% endraw %}{% if loop.index != 1 %}{% raw %} backup{% endraw %}{% endif %}{% raw %}{{ if eq $shard.ServiceMeta.http_backend_port "443" }} ssl verify none{{ end }} no-check agent-check agent-port {{ $shard.ServiceMeta.signal_sidecar_agent_port }} agent-inter {{ env "HAPROXY_AGENT_CHECK_INTERVAL" }} weight 256{{ end }}{{ end }}{% endraw %}{% endfor %}
{% for dc in ns.haproxy_datacenters %}{% raw %}{{ $dc_shards := print "signal@{% endraw %}{{ dc }}{% raw %}" }}{{ range $index, $shard := service $dc_shards }}{{ if ne $shard.ServiceMeta.release_number $release }}
{% for dc in ns.haproxy_datacenters %}{% raw %}{{ $dc_shards := print "signal@{% endraw %}{{ dc }}{% raw %}" }}{{ range $index, $shard := service $dc_shards }}{{ if and (ne $shard.ServiceMeta.release_number $release) (eq $shard.ServiceMeta.exclusive_release "" }}
server {{ $release }}-fallback-{{ $shard.ServiceMeta.shard }} {{ $shard.Address }}:{{ $shard.ServiceMeta.http_backend_port }} id {{ $shard_int := $shard.ServiceMeta.shard_id | parseInt }}{{ add $shard_int 10 }} backup{{ if eq $shard.ServiceMeta.http_backend_port "443" }} ssl verify none{{ end }} no-check agent-check agent-port {{ $shard.ServiceMeta.signal_sidecar_agent_port }} agent-inter {{ env "HAPROXY_AGENT_CHECK_INTERVAL" }} weight 256{{ end }}{{ end }}{% endraw %}{% endfor %}{% raw %}
{{ end }}{% endraw %}
{% for dc in ns.haproxy_datacenters %}{% raw %}{{ $dc_shards := print "signal@{% endraw %}{{ dc }}{% raw %}" }}{{ range $index, $shard := service $dc_shards }}{{ if and (ne $shard.ServiceMeta.release_number $release) (ne $shard.ServiceMeta.exclusive_release "") }}
server {{ $release }}-fallback-{{ $shard.ServiceMeta.shard }} {{ $shard.Address }}:{{ $shard.ServiceMeta.http_backend_port }} id {{ $shard_int := $shard.ServiceMeta.shard_id | parseInt }}{{ add $shard_int 10 }} backup{{ if eq $shard.ServiceMeta.http_backend_port "443" }} ssl verify none{{ end }} no-check agent-check agent-port {{ $shard.ServiceMeta.signal_sidecar_agent_port }} agent-inter {{ env "HAPROXY_AGENT_CHECK_INTERVAL" }} weight 256{{ end }}{{ end }}{% endraw %}{% endfor %}{% raw %}
{{ end }}{% endraw %}