Page MenuHomeDevCentral
Differential D2084

Usee Docker pillar information in nginx config
Changes PlannedPublic
Actions

Authored by dereckson on Oct 28 2019, 03:13.
Tags
None
Referenced Files
F25009388: D2084.diff
Wed, Mar 25, 01:13
F25005534: D2084.id10512.diff
Tue, Mar 24, 19:10
Unknown Object (File)
Tue, Mar 24, 00:23
Unknown Object (File)
Mon, Mar 23, 22:02
Unknown Object (File)
Sun, Mar 22, 02:14
Unknown Object (File)
Wed, Mar 18, 22:58
Unknown Object (File)
Mon, Mar 16, 17:35
Unknown Object (File)
Sun, Mar 15, 05:06
View All Files
Subscribers
None

Details

Reviewers
dereckson
Summary

Initially, the nginx configuration for the Alkane webserver role
used hardcoded port information to pass a request to Docker PaaS.

This change introduces a method to prepare a dictionary of proxy_pass URLs
per server and application, and applies it for API and infra.

Meanwhile, another change introduced a services table, but this change
allows to automatically handle host and port changes.

Test Plan

Deploy on Ysul

Diff Detail

Repository
rOPS Nasqueron Operations
Lint
Lint Passed
SeverityLocationCodeMessage
Advice_modules/paas_docker.py:138F821flake8 F821
Advice_modules/paas_docker.py:141F821flake8 F821
Unit
No Test Coverage
Branch
configure-docker-upstreams
Build Status
Buildable 6525
Build 6809: arc lint + arc unit

Event Timeline

dereckson requested review of this revision.Oct 28 2019, 03:13
dereckson created this revision.
Harbormaster completed remote builds in B3241: Diff 5249.Oct 28 2019, 03:13
dereckson updated this revision to Diff 5250.Oct 28 2019, 03:15

Remove debug information, use correct pillar syntax.

Harbormaster completed remote builds in B3242: Diff 5250.Oct 28 2019, 03:15
dereckson updated this revision to Diff 5260.Oct 28 2019, 14:28

Call paas_docker.get_upstreams()

Harbormaster completed remote builds in B3248: Diff 5260.Oct 28 2019, 14:28
dereckson added a comment.Mon, Mar 23, 13:34

This change is interesting and should be rebased.

dereckson updated this revision to Diff 10512.Mon, Mar 23, 14:04

Rebased against current main for Alkane.

Harbormaster completed remote builds in B6525: Diff 10512.Mon, Mar 23, 14:04
dereckson retitled this revision from WIP: Use Docker pillar information in nginx config to Usee Docker pillar information in nginx config.Mon, Mar 23, 14:04
dereckson added a comment.Mon, Mar 23, 14:12

Next: try salt web-001 paas_docker.get_upstreams

dereckson edited the summary of this revision. (Show Details)Mon, Mar 23, 14:16
dereckson updated this revision to Diff 10516.Mon, Mar 23, 16:32

Rebased. Fixed pillar handling.

Harbormaster completed remote builds in B6529: Diff 10516.Mon, Mar 23, 16:32
dereckson planned changes to this revision.Mon, Mar 23, 16:37

The output is really useful to avoid to manually repeat the ports.

But since salt-tower, we can't have a view from web-001 on the docker-002 pillar.

For example, if we run paas_docker.get_upstreams against docker-002, we've this dictionary:

{P396}

So, if we want to adopt this system, there is a need to consolidate the salt-tower files, by recreating the former unified pillar.

dereckson added a comment.Mon, Mar 23, 17:06

I've asked upstream for advice how to resolve pillar for another server than the current node @ https://groups.google.com/g/salt-tower/c/XEKg2CEiZrU

Revision Contents
Changeset List

PathSize
_modules/
24 lines
roles/
webserver-alkane/
nginx/
2 lines
files/
vhosts/
nasqueron.org/
2 lines
2 lines

Diff 10512

View Options

_modules/paas_docker.py

Loading...
View Options

roles/webserver-alkane/nginx/config.sls

Loading...
View Options

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf

Loading...
View Options

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf

Loading...
Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator