Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

New Lesson - Introduction to Salt #114

Merged
merged 28 commits into from
Nov 6, 2018
Merged

Conversation

Sudhishna
Copy link
Contributor

@Sudhishna Sudhishna commented Oct 26, 2018

Changes 1:

  1. Removed Sudo requirement
  2. Salt Stack name changed to Salt.
  3. Removed the suggested files - push.sh, motd.sh.
  4. made the base docker image as antidotelabs/utility.

Changes 2:

  1. png file name changed.
  2. syringe file modified.
  3. letting the user cat and see the file contents.
  4. dockerfile modified
  5. credit section added

@Sudhishna
Copy link
Contributor Author

@Mierdin @cloudtoad We were able to fix the issues listed above. Successfully installed salt and created the master and minion. Was able to Ping and issued commands as well to the minion from the master.

now that the lesson with 3 stages are completed, please let us know what the next steps are. Should i be submitting a new pull request?

Thanks,
Sudhishna

@Mierdin
Copy link
Member

Mierdin commented Oct 27, 2018

Nope, this PR will suffice. I will review this and give you some comments. Please bear with me as yours is the first lesson PR so there may be a few wrinkles 😊

Copy link
Member

@Mierdin Mierdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a really great first PR, in not a long amount of time. Well done!

I have a few comments that I'd like to get addressed before we think about getting this hosted into NRE Labs (which I'm assuming is the ultimate goal) mostly around security. The docker images we want to put into production have to follow a certain standard of security, etc. The majority of my other comments are copyedit stuff.

Again though, really great first pass.

images/saltstack/motd.sh Outdated Show resolved Hide resolved
images/saltstack/push.sh Outdated Show resolved Hide resolved
images/saltstack/Dockerfile Outdated Show resolved Hide resolved
images/saltstack/Dockerfile Outdated Show resolved Hide resolved
lessons/lesson-30/stage1/guide.md Outdated Show resolved Hide resolved
@Mierdin
Copy link
Member

Mierdin commented Oct 27, 2018

One more note - the build failure is happening because you haven't updated CHANGELOG.md. Please add an entry there under "In Development" > "Curriculum".

@sudhiram9
Copy link
Contributor

@Mierdin Thanks for the feedback Will implement the changes suggested and upload the code to git.

@Mierdin
Copy link
Member

Mierdin commented Oct 29, 2018

@sudhiram9 FYI, take a look at https://docs.saltstack.com/en/latest/ref/configuration/nonroot.html - looks like a recent version of Salt does away with the root requirement.

@Sudhishna
Copy link
Contributor Author

@Mierdin Enabled permissions for the user->"antidote" for the directories listed in the link. I was still facing issues. Currently, added the "antidote" user to the sudoer list, as a workaround for this.

Will again try the solution given in the link and let you know if i can skip "root" requirement.

@Sudhishna
Copy link
Contributor Author

@Mierdin
before starting stage 3, is it possible to make some installations/configurations in the linux machine we are using (saltstack1) ?

@Mierdin
Copy link
Member

Mierdin commented Oct 31, 2018

@Sudhishna Depends what you mean. Can you elaborate on what you're trying to do? Generally the only configurations you can make are baked into the image, or done as part of the lesson. There's not currently any functionality to configure the linux machines between stages like the network devices.

@Sudhishna
Copy link
Contributor Author

Sudhishna commented Nov 2, 2018

Hi @Mierdin ,
Completed all the changes suggested and pushed the code to the git repo. https://github.com/Sudhishna/antidote

Please verify our changes and also let us know if further changes are required.

Thanks,
Sudhishna

Copy link
Member

@Mierdin Mierdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better! Thanks for the changes. Only a few more, mostly minor changes. I think we'll be ready to merge with one more pass. See comments in-line.

Please also update the CHANGELOG (that's why CI is failing) and edit the description for this PR to summarize the changes made, rather than the old text when you were troubleshooting this lesson.

lessons/lesson-30/syringe.yaml Show resolved Hide resolved
lessons/lesson-30/syringe.yaml Outdated Show resolved Hide resolved
lessons/lesson-30/stage1/guide.md Outdated Show resolved Hide resolved
lessons/lesson-30/stage2/guide.md Outdated Show resolved Hide resolved
lessons/lesson-30/stage2/guide.md Show resolved Hide resolved
lessons/lesson-30/stage2/guide.md Show resolved Hide resolved
lessons/lesson-30/stage3/guide.md Outdated Show resolved Hide resolved
images/saltstack/Dockerfile Outdated Show resolved Hide resolved
lessons/lesson-30/stage1/guide.md Show resolved Hide resolved
@Mierdin Mierdin changed the title WIP: SaltStack Lesson - 30 New Lesson - Introduction to Salt Nov 6, 2018
@Sudhishna
Copy link
Contributor Author

@Mierdin Hi Matt, made the second level of changes suggested as well. Please verify if everything is okay.

Copy link
Member

@Mierdin Mierdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job.

@Mierdin Mierdin merged commit 7c38d0f into nre-learning:master Nov 6, 2018
@Sudhishna
Copy link
Contributor Author

@Mierdin should i be able to verify the lesson via https://ptr.labs.networkreliability.engineering/labs/?lessonId=30&lessonStage=1

cause, when i checked the above link, it wasn't reflecting the changes i made yesterday. Please let me know if i should be checking the lesson elsewhere.

Thanks,
Sudhishna

@Mierdin
Copy link
Member

Mierdin commented Nov 6, 2018

Please keep these PRs focused on the content being changed - save operational discussions for Slack.

@nre-learning nre-learning locked as resolved and limited conversation to collaborators Nov 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants