Page MenuHomeDevCentral

Consolidate web content units into webserver-content role
ClosedPublic

Authored by dereckson on Nov 23 2017, 05:06.
Tags
None
Referenced Files
F2848636: D1259.id3243.diff
Wed, Apr 24, 21:44
F2846811: D1259.id3243.diff
Wed, Apr 24, 11:23
F2846810: D1259.id3242.diff
Wed, Apr 24, 11:23
F2846307: D1259.id3237.diff
Wed, Apr 24, 08:29
Unknown Object (File)
Tue, Apr 23, 16:15
Unknown Object (File)
Tue, Apr 23, 01:08
Unknown Object (File)
Fri, Apr 19, 19:10
Unknown Object (File)
Fri, Apr 19, 16:44
Subscribers
None

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
Lint Passed
Unit
No Test Coverage
Branch
webserver-content
Build Status
Buildable 2001
Build 2249: arc lint + arc unit

Event Timeline

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

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

This revision is now accepted and ready to land.Nov 24 2017, 06:09
dereckson edited the test plan for this revision. (Show Details)
This revision was automatically updated to reflect the committed changes.