Added Stage 4 for the SaltStack lesson #235

skondvilkar · 2019-06-18T22:26:25Z

Added Stage 4 with the following addition or modification of the files:

Added .sls and .conf files under ../nrelabs-curriculum/images/salt/salt_configs
Added guide.md under ../nrelabs-curriculum/lessons/tools/lesson-30-salt/stage4
Modified top.sls file
Modified lesson.meta.yaml
Modified Dockerfile for the Salt image

* WIP collections stuff Signed-off-by: Matt Oswalt <[email protected]> * use correct branch in collection image URL Signed-off-by: Matt Oswalt <[email protected]> * updating collection examples Signed-off-by: Matt Oswalt <[email protected]> * Add cumulus Signed-off-by: Matt Oswalt <[email protected]> * formatting changes Signed-off-by: Matt Oswalt <[email protected]> * Added lessons to juniper curriculum Signed-off-by: Matt Oswalt <[email protected]> * shorten fields Signed-off-by: Matt Oswalt <[email protected]> * Add pp Signed-off-by: Matt Oswalt <[email protected]> * Last-minute updates to changelog and collections meta Signed-off-by: Matt Oswalt <[email protected]> * update paths with new lesson directory mount point Signed-off-by: Matt Oswalt <[email protected]> * update changelog Signed-off-by: Matt Oswalt <[email protected]> * Modified Dockerfile for Salt image and added guide.md for stage 4

o# the commit. Syncing with the master repo

Signed-off-by: skondvilkar <[email protected]>

Mierdin · 2019-06-18T23:00:55Z

Since there was some flux earlier today, can you let me know when this is ready for review? You can feel free to work on it in the meantime if not, just mark it as "draft". Let us know either way so I or @cloudtoad can take a look at it.

skondvilkar · 2019-06-18T23:03:03Z

@Mierdin it is ready for review. These are our final changes for stage 4. Sorry for the confusion earlier.

Mierdin · 2019-07-08T23:19:02Z

Please open a new PR to submit a changelog update

…

On Mon, Jul 8, 2019, 5:27 PM Derick Winkworth ***@***.***> wrote: ***@***.**** approved this pull request. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#235?email_source=notifications&email_token=ABAIZ633FST7PMOAPHLMRW3P6OWKLA5CNFSM4HZELCXKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOB5ZI5VI#pullrequestreview-259165909>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABAIZ66S6I6TTSXGBBMQ2TLP6OWKLANCNFSM4HZELCXA> .

Signed-off-by: skondvilkar <[email protected]>

updated changelog.md

skondvilkar · 2019-07-09T22:09:43Z

changelog file updated

Mierdin · 2019-07-12T19:35:48Z

Thanks. Ignore my comment about a "new PR". For some reason I thought this was merged. Putting the changelog update in this PR is the right action.

cloudtoad · 2019-10-15T13:23:10Z

I will check this branch this evening. out and update it so that we can merge it with the current version of the antidote platform.

skondvilkar · 2019-10-15T23:22:02Z

Thanks, @cloudtoad. Let me know if there's anything I can help with.

Mierdin · 2019-10-16T02:57:25Z

It sounds like this should be part of v1.0.1 so I added it to that project plan.

Mierdin · 2020-01-16T01:30:17Z

@skondvilkar My sincere apologies for taking so long on this. We're kickstarting the next curriculum release to coincide with the relaunch activities that are taking place in about a month, so we are looking to do a release within the next two weeks.

As part of this, I'll be looking to merge this work (finally). One thing I wanted to ask is, since it's been so long, if I review this, are you able to make minor fixes as I bring them up within that timeframe? If not that's fine, just trying to plan how I spend my time in the next few weeks.

Thanks again for this.

skondvilkar · 2020-01-16T18:09:31Z

@Mierdin sure. Let me know what changes will be required, and I'll make them accordingly. It's been a while since I worked with the NRE labs platform.

Mierdin

In general, this is great. Just some minor things I'd like to see adjusted, mostly to reduce long-term complexity. The content itself is awesome.

Thanks!

Mierdin · 2020-01-17T00:59:31Z

images/salt/Dockerfile

@@ -25,6 +25,16 @@ COPY ./salt_configs/vqfx1.sls /srv/pillar
 # Add pillar file for top
 COPY ./salt_configs/top.sls /srv/pillar

+# Add salt file for infrastructure data


In general, we like to avoid loading images up with lesson-specific configuration files and other scripts. Any reason why these files couldn't go in the root of the lesson directory, or perhaps stage4 directory?

Looking more broadly at the Dockerfile, looks like this was already being done. Since you've agreed to let me finish this out, I'll just focus on moving these three files out of the salt image and into the stage4 directory (and will accordingly update the stage 4 lesson guide). However, all other per-stage files should be kept out of the image to keep it more reusable, so I opened #295 to follow up on this in a separate PR later.

Eh.....after thinking about it a bit more, the lesson works well enough for now, so I'm going to leave things the way they are. In #295, we'll work to move these files out of the image and into perhaps the configs directory where they can be placed in the correct location on behalf of the user, without muddying the image for others that might want to use it. For now, nevermind. :)

Mierdin · 2020-01-17T01:02:57Z

lessons/tools/lesson-30-salt/stage4/guide.md

+```
+cat /srv/pillar/infrastructure_data.sls
+``` 
+<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('salt1', 0)">Verify Output (Optional)</button>


The snippet index you're providing here is actually not needed anymore. You can provide the this keyword and antidote-web will take care of identifying the correct snippet. You can still use this old way of doing things but it's more brittle, so I'd prefer you update these. See below

Suggested change

<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('salt1', 0)">Verify Output (Optional)</button>

<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('salt1', this)">Verify Output (Optional)</button>

Mierdin · 2020-01-24T21:35:57Z

@skondvilkar Any updates? We're gonna be looking to do a curriculum release pretty soon. We can either delay this PR until the next release, or if you're okay with it, I can make the changes I'm requested above on your behalf. Just let me know

skondvilkar · 2020-01-25T00:59:52Z

@Mierdin, if you could make the changes, that would be great. I have some last-minute deadlines to meet, and I'll also have to spin up the environment on my machine. Sorry for the delay.

Signed-off-by: Matt Oswalt <[email protected]>

…d remain open to additional stages in the future Signed-off-by: Matt Oswalt <[email protected]>

Signed-off-by: Matt Oswalt <[email protected]>

Mierdin · 2020-01-25T20:04:09Z

I added a few commits, all of which were aimed at fixing pretty minor issues. In my testing, everything seems to work properly, so I'm going to merge this now. Please let me know ASAP if you think anything else should be changed - if it's a small change, we might be able to get it in before v1.1.0 is released sometime next week. Otherwise, it will have to wait until later.

Thanks again for adding this stage to the lesson!

skondvilkar · 2020-01-27T07:22:48Z

@Mierdin, this looks good to me. Thank you for making the changes.

Mierdin · 2020-01-27T07:23:31Z

No problem - thank you for verifying

skondvilkar added 4 commits June 11, 2019 16:23

Stage 4 added

5c2ab10

Merge remote-tracking branch 'upstream/master'

b330157

o# the commit. Syncing with the master repo

Stage 4

2806633

Signed-off-by: skondvilkar <[email protected]>

Mierdin requested a review from cloudtoad June 18, 2019 23:30

cloudtoad previously approved these changes Jul 8, 2019

View reviewed changes

skondvilkar dismissed cloudtoad’s stale review via 2806633 July 9, 2019 20:49

skondvilkar force-pushed the master branch from d7e0b30 to 2806633 Compare July 9, 2019 20:49

skondvilkar added 3 commits July 9, 2019 14:05

Merge remote-tracking branch 'upstream/master'

a5b3ee1

updated changelog.md

01c93c8

Signed-off-by: skondvilkar <[email protected]>

Merge pull request #5 from skondvilkar/shwetak02

43d59fc

updated changelog.md

Merge branch 'master' into master

300785b

Mierdin reviewed Jan 17, 2020

View reviewed changes

Merge branch 'master' into master

9ccc16f

Mierdin mentioned this pull request Jan 25, 2020

Move per-lesson/stage files out of salt image #295

Open

Mierdin added 2 commits January 24, 2020 23:41

Add step to install tzdata noninteractively

d4a339d

Signed-off-by: Matt Oswalt <[email protected]>

Add newlines to config files so they show up properly in terminal output

8f97869

Signed-off-by: Matt Oswalt <[email protected]>

Mierdin added 3 commits January 24, 2020 23:42

Remove empty file (erroneously committed?)

31b5867

Signed-off-by: Matt Oswalt <[email protected]>

Amend end of stage3/stage4 guides to flow better with new content (an…

a0f9105

…d remain open to additional stages in the future Signed-off-by: Matt Oswalt <[email protected]>

Use 'this' keyword for all snippet run buttons

f9109df

Signed-off-by: Matt Oswalt <[email protected]>

Mierdin merged commit afb3f95 into nre-learning:master Jan 25, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Stage 4 for the SaltStack lesson #235

Added Stage 4 for the SaltStack lesson #235

skondvilkar commented Jun 18, 2019 •

edited

Loading

Mierdin commented Jun 18, 2019

skondvilkar commented Jun 18, 2019 •

edited

Loading

Mierdin commented Jul 8, 2019 via email

skondvilkar commented Jul 9, 2019

Mierdin commented Jul 12, 2019

cloudtoad commented Oct 15, 2019

skondvilkar commented Oct 15, 2019

Mierdin commented Oct 16, 2019

Mierdin commented Jan 16, 2020

skondvilkar commented Jan 16, 2020

Mierdin left a comment

Mierdin Jan 17, 2020

Mierdin Jan 25, 2020

Mierdin Jan 25, 2020

Mierdin Jan 17, 2020

Mierdin commented Jan 24, 2020

skondvilkar commented Jan 25, 2020

Mierdin commented Jan 25, 2020

skondvilkar commented Jan 27, 2020

Mierdin commented Jan 27, 2020

	<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('salt1', 0)">Verify Output (Optional)</button>
	<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('salt1', this)">Verify Output (Optional)</button>

Added Stage 4 for the SaltStack lesson #235

Added Stage 4 for the SaltStack lesson #235

Conversation

skondvilkar commented Jun 18, 2019 • edited Loading

Mierdin commented Jun 18, 2019

skondvilkar commented Jun 18, 2019 • edited Loading

Mierdin commented Jul 8, 2019 via email

skondvilkar commented Jul 9, 2019

Mierdin commented Jul 12, 2019

cloudtoad commented Oct 15, 2019

skondvilkar commented Oct 15, 2019

Mierdin commented Oct 16, 2019

Mierdin commented Jan 16, 2020

skondvilkar commented Jan 16, 2020

Mierdin left a comment

Choose a reason for hiding this comment

Mierdin Jan 17, 2020

Choose a reason for hiding this comment

Mierdin Jan 25, 2020

Choose a reason for hiding this comment

Mierdin Jan 25, 2020

Choose a reason for hiding this comment

Mierdin Jan 17, 2020

Choose a reason for hiding this comment

Mierdin commented Jan 24, 2020

skondvilkar commented Jan 25, 2020

Mierdin commented Jan 25, 2020

skondvilkar commented Jan 27, 2020

Mierdin commented Jan 27, 2020

skondvilkar commented Jun 18, 2019 •

edited

Loading

skondvilkar commented Jun 18, 2019 •

edited

Loading