Page MenuHomeDevCentral

Consolidate web content units into webserver-content role
ClosedPublic

Authored by dereckson on Nov 23 2017, 05:06.

Details

Summary

Roles

The webserver-content role will receive all instructions
to provision /var/wwwroot folders.

The organization follows the one defined in the first commits
for webserver-legacy/, with folders and subfolders according
the FQDN.

States

The eglide-website unit contained also nginx configuration,
moved temporarily to the shellserver/web-hosting role.
In the short to medium term, it will be consolidated into
a more generic webserver-core.

Pillar

The salt master knows what to deploy on what server through
the web_content_sls pillar entry.

The webserver pillar entries are now available to each server.

Refs

The commits a0d4bf923805 and 23815a361565 have prepared the groundwork.

Ref T1325

Test Plan

First, check Eglide and Ysul got the correct ones:

  • salt-call --local node.filter_by_role web_content_sls
  • salt eglide node.filter_by_role web_content_sls

Then, ensure salt * state.apply webserver-content is no-op.

Units tests added for node.has_web_content

Diff Detail

Repository
rOPS Nasqueron Operations
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

dereckson created this revision.Nov 23 2017, 05:06
dereckson planned changes to this revision.Nov 24 2017, 03:13

So, include can't receive a list from a Salt method. We're switching to a check in role files.

dereckson updated this revision to Diff 3242.Nov 24 2017, 04:21

Use a generator script and a Makefile to update role/webserver-content/init.sls from pillar

dereckson accepted this revision.Nov 24 2017, 06:09
This revision is now accepted and ready to land.Nov 24 2017, 06:09
dereckson edited the summary of this revision. (Show Details)Nov 24 2017, 06:55
dereckson edited the test plan for this revision. (Show Details)
dereckson updated this revision to Diff 3248.Nov 24 2017, 06:58

main entry point

This revision was automatically updated to reflect the committed changes.