diff --git a/docs/1-introduction/1.1-devops-defined.md b/docs/1-introduction/1.1-devops-defined.md index ca9646a7..ebe02279 100644 --- a/docs/1-introduction/1.1-devops-defined.md +++ b/docs/1-introduction/1.1-devops-defined.md @@ -85,6 +85,6 @@ Having a strong toolset along with the knowledge of tools can be the difference Look through [The DevOps Roadmap](https://roadmap.sh/devops) to get an idea of a modern toolset used by DevOps engineers, many of which will be touched on throughout the bootcamp. -# Deliverable +## Deliverable Describe DevOps in your own words with your peers. diff --git a/docs/1-introduction/1.2-liatrio-and-devops.md b/docs/1-introduction/1.2-liatrio-and-devops.md index 6fd93d8a..454554a9 100644 --- a/docs/1-introduction/1.2-liatrio-and-devops.md +++ b/docs/1-introduction/1.2-liatrio-and-devops.md @@ -46,10 +46,12 @@ DevOps practices aim to take the pain out of software delivery and deployment. Culture and the importance of culture to the effectiveness of an organization has been mentioned multiple times up to now. Take some time to read the [About Liatrio](https://www.liatrio.com/about) page to learn about the basis of Liatrio's own culture. Go back and re-read this page every so often; the Tao is central to our ways of working, and is vital to keep in mind. +## Knowledge Check +
-# Deliverable +## Deliverable Discuss what Liatrio does with your peers. Do you have any questions? diff --git a/docs/1-introduction/1.3.1-unix.md b/docs/1-introduction/1.3.1-unix.md index 7d79c525..2bb37f56 100644 --- a/docs/1-introduction/1.3.1-unix.md +++ b/docs/1-introduction/1.3.1-unix.md @@ -150,6 +150,8 @@ rm -r liatrio_console_tutorial | `chown` | `chown user:group my_file` | Change user or group ownership of a given argument | | `ctrl + r` | **N/A** | Search through command line history | +## Knowledge Check +
diff --git a/docs/1-introduction/1.3.2-vim.md b/docs/1-introduction/1.3.2-vim.md index 844443bd..106a5e25 100644 --- a/docs/1-introduction/1.3.2-vim.md +++ b/docs/1-introduction/1.3.2-vim.md @@ -112,10 +112,12 @@ Normal mode. ?> To learn more about Vim, use the command `vimtutor` in your terminal to run through a tutorial that explores more advanced commands. +## Knowledge Check +
-# Deliverables +## Deliverable -- Discuss the benefits of using Vim in your workflow +Discuss the benefits of using Vim in your workflow diff --git a/docs/1-introduction/1.3.3-installations.md b/docs/1-introduction/1.3.3-installations.md index d23a9097..f55ae7af 100644 --- a/docs/1-introduction/1.3.3-installations.md +++ b/docs/1-introduction/1.3.3-installations.md @@ -81,6 +81,6 @@ The official package repositories for major distros receive a lot of scrutiny an ![security image](img1/security_light.svg ':size=150x150 :class=light-mode-icon :alt= security image; light mode') ![security image](img1/security_dark.svg ':size=150x150 :class=dark-mode-icon :alt= security image; dark mode') -# Deliverable +## Deliverable Install what software you think you need on your Mac using Homebrew. Once that is complete, research `brew leaves` and discuss your conclusions. diff --git a/docs/1-introduction/1.3.4-passwords-and-keys.md b/docs/1-introduction/1.3.4-passwords-and-keys.md index 5228371f..38376630 100644 --- a/docs/1-introduction/1.3.4-passwords-and-keys.md +++ b/docs/1-introduction/1.3.4-passwords-and-keys.md @@ -102,8 +102,7 @@ Host my_host Now you can simply connect with `ssh my_host` and it will use the full hostname, user and identity file automatically. -# Deliverable +## Deliverables -Create a pair of SSH keys, add the public key to an SSH server and verify you can log in without your password. - -What are some advantages / disadvantages of public key and password authentication? +- Create a pair of SSH keys, add the public key to an SSH server and verify you can log in without your password. +- What are some advantages / disadvantages of public key and password authentication? diff --git a/docs/1-introduction/1.3.5-networking.md b/docs/1-introduction/1.3.5-networking.md index db3f630a..c6ca441d 100644 --- a/docs/1-introduction/1.3.5-networking.md +++ b/docs/1-introduction/1.3.5-networking.md @@ -89,6 +89,8 @@ portion of the address. | 192.168.5.40/24 | 255.255.255.0 | 192.168.5.0 | | 10.0.162.5/20 | 255.255.240.0 | 10.0.160.0 | +## Knowledge Check +
@@ -106,7 +108,7 @@ within a private range will ensure no conflicts with public servers. | 172.16.0.0/12 | 172.16.0.0 - 172.31.255.255 | 1,048,576 | | 192.168.0.0/16 | 192.168.0.0 - 192.168.255.255 | 65,536 | -# Exercise +## Exercise Examine the network your computer is on and try to answer the following questions: @@ -117,6 +119,6 @@ Examine the network your computer is on and try to answer the following question - What is your computers public Internet IP address? (hint: google `what is my ip`) - How does the private subnet IP address of your computer and the public Internet IP address relate to each other? How does traffic get routed from the Internet to your computer? -# Deliverable +## Deliverable Discuss the role networking plays in software delivery and difficulties enterprise organizations may experience with networking. diff --git a/docs/1-introduction/1.4-external-resources.md b/docs/1-introduction/1.4-external-resources.md index 5b7f968a..240ee93e 100644 --- a/docs/1-introduction/1.4-external-resources.md +++ b/docs/1-introduction/1.4-external-resources.md @@ -44,6 +44,6 @@ At Liatrio, we're always sharing fun or informative learning resources we come a ![playbook image](img1/playbook_light.svg ':size=150x150 :class=light-mode-icon') ![playbook image](img1/playbook_dark.svg ':size=150x150 :class=dark-mode-icon') -# Deliverable +## Deliverable Visit a few of the resources and discuss what you learned. diff --git a/docs/README.md b/docs/README.md index 784a3605..c39c2ae4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1037,7 +1037,7 @@ Welcome! You must be here because you're interested in DevOps. Don't worry, we'l ## Target Audience -This DevOps Bootcamp is used as an introduction to DevOps for Liatrio's apprentices. Therefore, there are deliverables at the end of each section and quizzes sprinkled throughout that help guide the apprentices' training. However, anyone can go through the DevOps Bootcamp. Feel free to ignore the deliverables, quizzes, etc. This bootcamp also assumes the bootcamper is using a Mac for the deliverables. +This DevOps Bootcamp is used as an introduction to DevOps for Liatrio's apprentices. Therefore, there are deliverables at the end of each section and knowledge checks sprinkled throughout that help guide the apprentices' training. However, anyone can go through the DevOps Bootcamp. Feel free to ignore the deliverables, knowledge checks, etc. This bootcamp also assumes the bootcamper is using a Mac for the deliverables. ## Disclaimer @@ -1069,17 +1069,17 @@ This bootcamp alone will by no means make anyone an expert on DevOps; that's whe > "It's better to over communicate than to under communicate." -## Deliverable and Quiz Format +## Deliverable and Knowledge Check Format **Deliverables** If you are an apprentice (or if you just want to add to your learning), here's a little insight on the deliverables the bootcamp will provide. At the end of each section, you will typically encounter a bulleted list of deliverables. They will usually be structured to get you thinking/reflecting/researching key points that the section covered. -**Quizzes** +**Knowledge Checks** -As mentioned before, you'll also find small quizzes sprinkled throughout the bootcamp. Don't worry, they aren't graded and scores aren't tracked, so there's zero pressure when it comes to them. That being said, they are very valuable for learning, so it would be wise to take the time to not only get the correct answers on them, but to really understand *why* those are the correct answers. +As mentioned before, you'll also find small knowledge checks sprinkled throughout the bootcamp. Don't worry, they aren't graded and scores aren't tracked, so there's zero pressure when it comes to them. That being said, they are very valuable for learning, so it would be wise to take the time to not only get the correct answers on them, but to really understand *why* those are the correct answers. -Here's a sample quiz to show you how they'll behave: +Here's a sample knowledge check to show you how they'll behave: