Differential D4421

Add staging reverse proxy role
ClosedPublic
Actions

Authored by ardumont on Nov 5 2020, 7:50 PM.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

System administrators

Maniphest Tasks

T2747: Create the reverse proxy to expose the staging services publicly

Commits

rSPSITE6ad80079e5ad: Rework webapp and deposit roles with and without reverse proxy
rSPSITE36269a14938c: Remove reverse proxy behavior from swh::deploy::{deposit, webapp}
rSPSITEebb015428bff: Define common apache configuration in staging/common.yaml
rSPSITEa18f8fc74d15: Bootstrap staging reverse proxy (role, profile)

Summary

(worked pairing with @vsellier)

This now declares the following roles and deploys them accordingly (this does
not change anything in production):

swh_rp_webapp: webapp with reverse proxy (deployed on node webapp0.azure)
swh_rp_webapps: webapp and deposit with reverse proxy behavior (deployed on node moma)
swh_webapp: only webapp service (deployed on node webapp.staging)
swh_deposit: only deposit service (deploy on node deposit.staging)

Related to T2747#52193 (<- drawings in there)

Test Plan

bin/octocatalog-diff on moma/webapp0: nothing changes expectedly
vagrant up staging-webapp (webapp installed no rp)
vagrant up staging-deposit (deposit installed no rp)
vagrant up staging-rp0 (reverse proxy installed)

Diff Detail

Repository

rSPSITE puppet-swh-site

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Nov 5 2020, 7:50 PM

Harbormaster completed remote builds in B16884: Diff 15662.Nov 5 2020, 7:50 PM

ardumont edited the summary of this revision. (Show Details)Nov 5 2020, 7:51 PM

ardumont edited the summary of this revision. (Show Details)

Rebase

Harbormaster completed remote builds in B16888: Diff 15667.Nov 6 2020, 10:11 AM

Rebase

Harbormaster completed remote builds in B16890: Diff 15669.Nov 6 2020, 10:15 AM

LGTM

This revision is now accepted and ready to land.Nov 6 2020, 10:32 AM

ardumont added inline comments.Nov 6 2020, 10:34 AM

manifests/site.pp
164	Already defined in the scaffolding inheritance we use.

Closed by commit rSPSITEa18f8fc74d15: Bootstrap staging reverse proxy (role, profile) (authored by ardumont). · Explain WhyNov 6 2020, 10:36 AM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rSPSITEa18f8fc74d15: Bootstrap staging reverse proxy (role, profile).

ardumont added a commit: rSPSITEebb015428bff: Define common apache configuration in staging/common.yaml.

ardumont added a commit: rSPSITE36269a14938c: Remove reverse proxy behavior from swh::deploy::{deposit, webapp}.

ardumont added a commit: rSPSITE6ad80079e5ad: Rework webapp and deposit roles with and without reverse proxy.

Revision Contents
Changeset List

Path

Size

data/

deployments/

staging/

12 lines

hostname/

deposit.internal.staging.swh.network.yaml

6 lines

webapp.internal.staging.swh.network.yaml

4 lines

manifests/

4 lines

site-modules/

profile/

manifests/

swh/

deploy/

reverse_proxy.pp

46 lines

role/

manifests/

swh_reverse_proxy.pp

3 lines

Diff 15677

data/deployments/staging/common.yaml

Loading...

data/hostname/deposit.internal.staging.swh.network.yaml

Loading...

data/hostname/webapp.internal.staging.swh.network.yaml

Loading...

manifests/site.pp

Loading...

site-modules/profile/manifests/swh/deploy/reverse_proxy.pp

Loading...

site-modules/role/manifests/swh_reverse_proxy.pp

Loading...