From 318376f941f62f7d394851fc8d5ea0e5fcd5bce4 Mon Sep 17 00:00:00 2001 From: Roland Wolters Date: Fri, 12 Jul 2019 16:27:05 +0200 Subject: [PATCH] Remove linklight name from main readme and docs (#323) --- README.md | 4 ++-- docs/contribute.md | 26 +++++++++++++------------- docs/faq.md | 2 +- docs/setup.md | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 1623a5577..7e2353116 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# ANSIBLE LINKLIGHT +# ANSIBLE WORKSHOPS ![linklight](images/linklight.png) -The Red Hat Ansible Automation Linklight project is intended for effectively demonstrating Ansible's capabilities through instructor-led workshops or self-paced exercises. +The Red Hat Ansible Automation Workshops project is intended for effectively demonstrating Ansible's capabilities through instructor-led workshops and self-paced exercises. # INSTRUCTOR LED WORKSHOPS: diff --git a/docs/contribute.md b/docs/contribute.md index 4a3936b46..869122220 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -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 Linklight project. +It is important to know how to keep your fork in sync with the upstream Workshops project. ### Configuring Your Remotes -Configure Linklight as your upstream so you can stay in sync +Configure `ansible/workshops` as your upstream so you can stay in sync ```bash -git remote add upstream https://github.com/network-automation/linklight.git +git remote add upstream https://github.com/ansible/workshops.git ``` ### Rebasing Your Branch @@ -37,16 +37,16 @@ More info on docs.ansible.com: [Rebasing a Pull Request](http://docs.ansible.com ## Create a pull requests -Make sure you are not behind (in sync) and then submit a PR to LinkLight. +Make sure you are not behind (in sync) and then submit a PR to the Ansible Workshops. [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 Linklight, 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 Workshops, 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 Linklight 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 the Ansible Workshops 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. Linklight 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. Ansible Workshops have to balance many different types of users. Thank you for contributing! # Notes April 3rd, 2019 @@ -92,11 +92,11 @@ git pull --rebase origin master 1) Fork 2) Clone devel -2a)git remote add upstream https://github.com/network-automation/linklight.git -origin https://github.com/gdykeman/linklight (fetch) -origin https://github.com/gdykeman/linklight (push) -upstream https://github.com/network-automation/linklight.git (fetch) -upstream https://github.com/network-automation/linklight.git (push) +2a)git remote add upstream https://github.com/ansible/workshops.git +origin https://github.com/gdykeman/workshops (fetch) +origin https://github.com/gdykeman/workshops (push) +upstream https://github.com/ansible/workshops.git (fetch) +upstream https://github.com/ansible/workshops.git (push) 3) git checkout 4) Make changes 5) push branch into origin @@ -108,6 +108,6 @@ upstream https://github.com/network-automation/linklight.git (push) # Going Further -The following links will be helpful if you want to contribute code to the Linklight project, or any Ansible project: +The following links will be helpful if you want to contribute code to the Ansible Workshops 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) diff --git a/docs/faq.md b/docs/faq.md index 97316fcbc..ccf5072a3 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -132,7 +132,7 @@ This is likely if you are using the device (CSR/F5/vMX) for the first time in AW ``` TASK [f5_setup : Install AS3] ******************************************************************************* -fatal: [TESTWORKSHOP-student1-f5]: FAILED! => {"changed": false, "cmd": "rpm -qp --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}' /linklight/provisioner/roles/f5_setup/files/f5-appsvcs-3.4.0-2.noarch.rpm", "msg": "[Errno 2] No such file or directory", "rc": 2} +fatal: [TESTWORKSHOP-student1-f5]: FAILED! => {"changed": false, "cmd": "rpm -qp --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}' /workshops/provisioner/roles/f5_setup/files/f5-appsvcs-3.4.0-2.noarch.rpm", "msg": "[Errno 2] No such file or directory", "rc": 2} ``` ### Solution: diff --git a/docs/setup.md b/docs/setup.md index 0aca7e892..d913e2806 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -25,12 +25,12 @@ aws_secret_access_key = ABCDEFGHIJKLMNOP/ABCDEFGHIJKLMNOP pip install passlib netaddr -6. Clone the linklight repo: +6. Clone the workshops repo: If you haven't done so already make sure you have the repo cloned to the machine executing the playbook - git clone https://github.com/network-automation/linklight.git - cd linklight/provisioner + git clone https://github.com/ansible/workshops.git + cd workshops/provisioner 7. When doing a networking or F5 workshop make sure you have subscribed to the right marketplace AMI (Amazon Machine Image)