Skip to content

Commit

Permalink
removal of lightbulb to make confusion less
Browse files Browse the repository at this point in the history
  • Loading branch information
IPvSean committed Mar 13, 2018
1 parent 84eb15c commit 53af698
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 52 deletions.
14 changes: 7 additions & 7 deletions decks/ansible-networking.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>What You Will Learn</h2>
<li>Reuse and Redistribution of Ansible Content with Roles</li>
</ul>
<aside class="notes">
<p>This deck is designed to provide students with direct introductory instruction and guidance to beginning to automate with Ansible. It is the starting point for students intent on becoming more proficient with Ansible through other Lightbulb modules and their own usage.</p>
<p>This deck is designed to provide students with direct introductory instruction and guidance to beginning to automate with Ansible. It is the starting point for students intent on becoming more proficient with Ansible through other Linklight modules and their own usage.</p>
<p>This deck supports lecture and hands-on forms of presenting this material. </p>
<p>Allow 2 hours to deliver the lecture-based form and 4 hours for stopping to do the workshop assignments. To access the additional slides for delivering the workshops, navigate down when available. </p>
<p>See the <a href="../facilitator/README.md">Ansible Lighttbulb facilitator&rsquo;s guide</a> for more details on using this deck and it&rsquo;s associated material.</p>
Expand Down Expand Up @@ -229,7 +229,7 @@ <h1>Demo Time: <br/>Installing Ansible</h1>
<h1>Workshop: <br/>Installing Ansible</h1>
<aside class="notes">
<p>This brief exercise demonstrates how easy it can be to install and configure ansible and begin automating.</p>
<p>See <code>workshops/ansible_install</code> in the Ansible Lightbulb repo for this workshop&apos;s assignment. It's solution and addition details can be found in <code>facilitator/solutions/ansible_install.md</code>.</p>
<p>See <code>workshops/ansible_install</code> in the Ansible Linklight repo for this workshop&apos;s assignment. It's solution and addition details can be found in <code>facilitator/solutions/ansible_install.md</code>.</p>
</aside>
</section>
<section>
Expand Down Expand Up @@ -559,7 +559,7 @@ <h1>Workshop: <br/>Ad-Hoc Commands</h1>
<aside class="notes">
<p>This brief exercise demonstrates Ansible in-action at it&apos;s most basic and simple level. Thru ad-hoc commands, students are exposed to Ansible modules and usage and will apply to their understanding of tasks and playbooks. This exercise also begins to expose students to the concepts of Ansible facts and inventory.</p>
<p>This workshop is also a good way to verify their lab environments are properly configured before going forward.</p>
<p>See <code>workshops/adhoc_commands</code> in the Ansible Lightbulb repo.</p>
<p>See <code>workshops/adhoc_commands</code> in the Ansible linklight repo.</p>
</aside>
</section>
<section>
Expand Down Expand Up @@ -804,7 +804,7 @@ <h1>Demo Time: <br/>Exercise 1.2 - Backing up Configurations</h1>
<h1>Workshop: <br/>Exercise 1.2 - Backing up Configurations</h1>
<aside class="notes">
<p>This assignment provides a quick introduction to playbook structure to give them a feel for how Ansible works, but in practice is too simplistic to be useful.</p>
<p>See <code>workshops/simple_playbook</code> in the Ansible Lightbulb repo.</p>
<p>See <code>workshops/simple_playbook</code> in the Ansible Linklight repo.</p>
<p>Note: If your time is limited, this is a workshop you can skip. We'll cover this and more topics in the next workshop.</p>
</aside>
</section>
Expand All @@ -819,7 +819,7 @@ <h1>Demo Time: <br/>Exercise 1.3 - Creating a GRE Tunnel</h1>
<h1>Workshop: <br/>Exercise 1.3 - Creating a GRE Tunnel</h1>
<aside class="notes">
<p>This assignment provides a quick introduction to playbook structure to give them a feel for how Ansible works, but in practice is too simplistic to be useful.</p>
<p>See <code>workshops/simple_playbook</code> in the Ansible Lightbulb repo.</p>
<p>See <code>workshops/simple_playbook</code> in the Ansible Linklight repo.</p>
<p>Note: If your time is limited, this is a workshop you can skip. We'll cover this and more topics in the next workshop.</p>
</aside>
</section>
Expand Down Expand Up @@ -965,7 +965,7 @@ <h1>Demo Time: <br/>Exercise 1.4 - Additional router configurations</h1>
<h1>Workshop: <br/>Exercise 1.4 - Additional router configurations</h1>
<aside class="notes">
<p>In this workshop assignment students are tasked with developing their first complete playbook. The assignment approximates the tasks they will typical need to take in order to deploy and configure a single application service using Nginx.</p>
<p>See <code>workshops/basic_playbook/</code> in the Ansible Lightbulb repo.</p>
<p>See <code>workshops/basic_playbook/</code> in the Ansible Linklight repo.</p>
<p>Tip: Don&apos;t rush this workshop. Give students ample time to do this workshop themselves to completion. This workshop covers the essential concepts and features of effectively automation with Ansible and builds up their core skills for further exploration.</p>
</aside>
</section>
Expand Down Expand Up @@ -1046,7 +1046,7 @@ <h1>Workshop: <br/>Your First Roles</h1>
<aside class="notes">
<p>Here students are tasked with refactoring their previous work from the Practical Playbook workshop into a role and modifying their playbook accordingly. We intentioinally avoid introducing any new tasks or functionality otherwise. The objective here is to focus students specifically on how roles are structured and develop.</p>
<p>You should emphasize the value of roles in better organizing playbooks as they grow in sophistication and making Ansible automation more portable and reusable than a basic playbook.</p>
<p>See <code>workshops/roles</code> in the Ansible Lightbulb repo.</p>
<p>See <code>workshops/roles</code> in the Ansible Linklight repo.</p>
</aside>
</section>
</section>
Expand Down
14 changes: 7 additions & 7 deletions docs/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Create a fork on your own Github project (or your personal space)
[Github Documentation on Forking a repo](https://help.github.com/articles/fork-a-repo/)

## Stay in Sync
It is important to know how to keep your fork in sync with the upstream Lightbulb project.
It is important to know how to keep your fork in sync with the upstream Linklight project.

### Configuring Your Remotes
Configure Lightbulb as your upstream so you can stay in sync
Configure Linklight as your upstream so you can stay in sync

```bash
git remote add upstream https://github.com/ansible/lightbulb.git
git remote add upstream https://github.com/network-automation/linklight.git
```

### Rebasing Your Branch
Expand All @@ -40,15 +40,15 @@ More info on docs.ansible.com: [Rebasing a Pull Request](http://docs.ansible.com
Make sure you are not behind (in sync) and then submit a PR to LinkLight.
[Read the Pull Request Documentation on Github.com](https://help.github.com/articles/creating-a-pull-request/)

Just because you submit a PR, doesn't mean that it will get accepted. Right now the QA process is manual for lightbulb, so provide detailed directions on
Just because you submit a PR, doesn't mean that it will get accepted. Right now the QA process is manual for Linklight, so provide detailed directions on

- WHY? Why did you make the change?
- WHO? Who is this for? If this is something for a limited audience it might not make sense for all users.
- BEST PRACTICE? Is this the "best" way to do this? Link to documentation or examples where the way you solved your issue or improved Lightbulb is the best practice for teaching or building workshops.
- BEST PRACTICE? Is this the "best" way to do this? Link to documentation or examples where the way you solved your issue or improved Linklight is the best practice for teaching or building workshops.

Being more descriptive is better, and has a higher change of getting merged upstream. Communication is key! Just b/c the PR doesn't get accepted right away doesn't mean it is not a good idea. Lightbulb has to balance many different types of users. Thank you for contributing!
Being more descriptive is better, and has a higher change of getting merged upstream. Communication is key! Just b/c the PR doesn't get accepted right away doesn't mean it is not a good idea. Linklight has to balance many different types of users. Thank you for contributing!

# Going Further
The following links will be helpful if you want to contribute code to the Lightbulb project, or any Ansible project:
The following links will be helpful if you want to contribute code to the Linklight project, or any Ansible project:
- [Ansible Committer Guidelines](http://docs.ansible.com/ansible/latest/committer_guidelines.html)
- [Learning Git](https://git-scm.com/book/en/v2)
2 changes: 1 addition & 1 deletion exercises/ansible_engine/1-adhoc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ We are going to be using the short-form options throughout this workshop.

---

[Click Here to return to the Ansible Lightbulb - Ansible Engine Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Ansible Engine Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/ansible_engine/2-playbook/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ like this. Take note of the spacing and alignment.
```
---

[Click Here to return to the Ansible Lightbulb - Ansible Engine Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Ansible Engine Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/ansible_engine/3-variables/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,4 @@ looks the way you intended. If not, now is the time for us to fix it up. The fi

---

[Click Here to return to the Ansible Lightbulb - Ansible Engine Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Ansible Engine Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/ansible_engine/4-runplaybook/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ If successful, you should see standard output that looks very similar to the fol

---

[Click Here to return to the Ansible Lightbulb - Ansible Engine Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Ansible Engine Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/ansible_engine/5-role/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,4 @@ You should now have a completed playbook, `site.yml` with a single role called `

---

[Click Here to return to the Ansible Lightbulb - Ansible Engine Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Ansible Engine Workshop](../README.md)
4 changes: 2 additions & 2 deletions exercises/ansible_engine/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Ansible Lightbulb - Ansible Engine
# Ansible Linklight - Ansible Engine

This content is a multi-purpose toolkit for effectively demonstrating Ansible's capabilities or providing informal workshop training in various forms -- instructor-led, hands-on or self-paced.

## Presentation
Want the Presentation Deck? Its right here:
[Ansible Essentials Lightbulb Deck](../../decks/ansible-essentials.html)
[Ansible Essentials Deck](../../decks/ansible-essentials.html)

## Ansible Engine Exercises

Expand Down
2 changes: 1 addition & 1 deletion exercises/networking/1.1-adhoc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ Feel free to check again using the ios_command
You have completed lab exercise 1.1

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
6 changes: 3 additions & 3 deletions exercises/networking/1.2-backup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ ansible-playbook host-routes.yml
You have completed lab exercise 1.2

# Answer Key
- For backup.yml [click here](https://github.com/network-automation/lightbulb/blob/master/workshops/networking/1.2-backup/backup.yml).
- For host-routes.yml [click here](https://github.com/network-automation/lightbulb/blob/master/workshops/networking/1.2-backup/host-routes.yml)
- For backup.yml [click here](https://github.com/network-automation/linklight/blob/master/exercises/networking/1.2-backup/backup.yml).
- For host-routes.yml [click here](https://github.com/network-automation/linklight/blob/master/exercises/networking/1.2-backup/host-routes.yml)

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
6 changes: 3 additions & 3 deletions exercises/networking/1.3-gre/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Notice the `when` statement shown above. This is a conditional. If the invento
Now that you’ve completed writing your playbook, let’s go ahead and save it. Use the write/quit method in vim to save your playbook, i.e. hit Esc then `:wq!` We now have our second playbook. Let’s go ahead and run that awesomeness!

## Step 6: Running the playbook
From your lightbulb directory, run the gre.yml playbook
From your linklight directory, run the gre.yml playbook
```bash
ansible-playbook gre.yml
```
Expand All @@ -116,7 +116,7 @@ You’ve successfully created a playbook that uses conditionals! Check out the [
You have completed lab exercise 1.3

# Answer Key
You can [click here](https://github.com/network-automation/lightbulb/blob/master/workshops/networking/1.3-gre/gre.yml).
You can [click here](https://github.com/network-automation/linklight/blob/master/exercises/networking/1.3-gre/gre.yml).

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/networking/1.4-router_configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ You have completed exercise 1.4
To view and run the completed playbook move on to [Exercise 1.5!](../1.5-run_routing_configs)

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
4 changes: 2 additions & 2 deletions exercises/networking/1.5-run_routing_configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ PING 172.18.4.188 (172.18.4.188) 56(84) bytes of data.
You have completed exercise 1.5

# Answer Key
You can [click here](https://github.com/network-automation/lightbulb/blob/master/workshops/networking/1.5-run_routing_configs/router_configs.yml).
You can [click here](https://github.com/network-automation/linklight/blob/master/exercises/networking/1.5-run_routing_configs/router_configs.yml).

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
4 changes: 2 additions & 2 deletions exercises/networking/1.6-roles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ $ ansible-playbook deploy_network.yml
You should now have a completed playbook, deploy_network.yml with a three roles called system, interface and static_route. The advantage of structuring your playbook into roles is that you can now add new roles to the playbook using Ansible Galaxy or simply writing your own. In addition, roles simplify changes to variables, tasks, templates, etc.

## Answer Key
Since there is multiple files, its best to [view this on GitHub](https://github.com/network-automation/lightbulb/tree/master/workshops/networking/1.6-roles).
Since there is multiple files, its best to [view this on GitHub](https://github.com/network-automation/linklight/tree/master/exercises/networking/1.6-roles).

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/networking/2.1-towerinstall/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ You know you were successful if you are able to browse to your Ansible Tower’s
![Figure 1: Ansible Tower Login Screen](tower.png)

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
6 changes: 3 additions & 3 deletions exercises/networking/2.2-towerconfigure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Click the ![Add](add.png) button
| **DESCRIPTION** | Workshop playbooks |
| **ORGANIZATION** | Default |
| **SCM TYPE** | Git |
| **SCM URL** | https://github.com/network-automation/lightbulb/ |
| **SCM URL** | https://github.com/network-automation/linklight/ |
| **SCM UPDATE OPTIONS** | Check Clean, Uncheck Delete on Update, Check Update on Launch |

![Figure 4: Defining a Project](project.png)
Expand Down Expand Up @@ -129,7 +129,7 @@ You should see output similar to the following:
```
[student2@ip-172-17-3-250 ~]$ sudo tower-manage inventory_import --source=/home/student1/networking-workshop/lab_inventory/hosts --inventory-name="Ansible Workshop Inventory"
1.676 INFO Updating inventory 2: Ansible Workshop Inventory
1.755 INFO Reading Ansible inventory source: /home/student2/lightbulb/lessons/lab_inventory/hosts
1.755 INFO Reading Ansible inventory source: /home/student2/linklight/lessons/lab_inventory/hosts
2.704 ERROR [WARNING]: Found both group and host with same name: control
2.704 INFO Processing JSON output...
2.704 INFO Loaded 3 groups, 4 hosts
Expand Down Expand Up @@ -157,4 +157,4 @@ Try browsing your inventory in Tower. You should now notice that the inventory h
At this point, we are doing with our basic configuration of Ansible Tower. In the next exercise, we will be solely focused on creating and running a job template so you can see Tower in action.

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
2 changes: 1 addition & 1 deletion exercises/networking/2.3-towerjob/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ The new job will run and use the IP address you chose in the survey. The survey
You have now completed this Tower lab.

---
[Click Here to return to the Ansible Lightbulb - Networking Workshop](../README.md)
[Click Here to return to the Ansible Linklight - Networking Workshop](../README.md)
5 changes: 2 additions & 3 deletions provisioner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
The default mode provisions four nodes per user:
* One control node from which Ansible will be executed from and where Ansible Tower can be installed (named ansible)
* Three web nodes that coincide with the three nodes in lightbulb's original design
* And one node where `haproxy` is installed (via lightbulb lesson)

## Ansible Networking Mode
This provisions the [Ansible Lightbulb - Networking Workshop](../exercises/networking).
This provisions the [Ansible Linklight - Networking Workshop](../exercises/networking).

This mode builds a four node workshop demonstrating Ansible’s capabilities on network equipment (e.g. Cisco Systems IOS):
* One control node from which Ansible will be executed from and where Ansible Tower can be installed (named `ansible`)
Expand Down Expand Up @@ -63,7 +62,7 @@ To provision the workshop onto AWS use the following directions:

pip install passlib

6. Clone the lightbulb repo:
6. Clone the linklight repo:

If you haven't done so already make sure you have the repo cloned to the machine executing the playbook

Expand Down
Loading

0 comments on commit 53af698

Please sign in to comment.