fixing directions to make it more clear

NetDevAutomate · Jul 3, 2018 · 270710b · 270710b
1 parent 7fd9b07
commit 270710b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 32 deletions.
diff --git a/docs/aws-directions/AWSHELP.md b/docs/aws-directions/AWSHELP.md
@@ -39,4 +39,4 @@ You now have your Access Key ID and Secret Access Key!
 - [Access Key ID and Secret Access Key](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html)
 - [managing-aws-access-keys.html](http://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html).
 
-[Return to aws_lab_setup directions](../README.md)
+[Return to aws_lab_setup directions](../../provisioner/README.md)
diff --git a/docs/faq.md b/docs/faq.md
@@ -16,7 +16,7 @@ fatal: [localhost]: FAILED! => {"attempts": 1, "changed": false, "msg": "boto is
 ### Solution:
 
 ```
-pip install boto boto3 
+pip install boto boto3
 ```
 
 
@@ -59,7 +59,7 @@ py_cmd.stdout.startswith('1.7')
 
 ### Solution
 
-Install boto3
+Install and/or upgrade boto3
 ```
 pip install boto3 --upgrade
 ```
@@ -68,11 +68,13 @@ Are you using Tower?  Make sure to use umask
 https://docs.ansible.com/ansible-tower/latest/html/upgrade-migration-guide/virtualenv.html
 
 ```
-source /var/lib/awx/venv/ansible/bin/activate
-umask 0022
-pip install --upgrade pywinrm
-deactivate
+[user@centos ~]$ sudo -i
+[root@centos ~]# source /var/lib/awx/venv/ansible/bin/activate
+[root@centos ~]# umask 0022
+[root@centos ~]# pip install --upgrade boto3
+[root@centos ~]# deactivate
 ```
+
 ## Problem: AWS Signature Failure
 ```
     "error": {
@@ -83,4 +85,4 @@ deactivate
 
 ### Solution
 
-Ensure the time on your Ansile Tower or Ansible Engine Server is correct. 
+Ensure the time on your Ansile Tower or Ansible Engine Server is correct.
diff --git a/provisioner/README.md b/provisioner/README.md
@@ -1,6 +1,6 @@
 # Ansible AWS training provisioner
 **aws_lab_setup** is an automated lab setup for Ansible training on AWS (Amazon Web Services).  There are currently two modes:
- - Ansible Essentials Mode (default)
+ - Ansible Engine Mode (default)
  - Ansible Networking Mode
 
 ## Ansible Engine Workshop
@@ -88,24 +88,26 @@ If you haven't done so already make sure you have the repo cloned to the machine
 
 1. Define the following variables in a file passed in using `-e @extra_vars.yml`
 
-```yml
-ec2_region: us-east-1                 # region where the nodes will live
-ec2_name_prefix: TRAININGLAB          # name prefix for all the VMs
-admin_password: ansible
-## Optional Variables
+```
+---
+ec2_region: us-east-1                  # region where the nodes will live
+ec2_name_prefix: TESTWORKSHOP          # name prefix for all the VMs
+student_total: 2                       # creates student_total of workbenches for the workshop
+#OPTIONAL VARIABLES
+admin_password: ansible                # password for Ansible control node, defaults to ansible
+networking: true                       # Set this if you want the workshop in networking mode
 localsecurity: false                   # skips firewalld installation and SE Linux when false
+create_login_page: true
+towerinstall: true                     # automatically installs Tower to control node
+# autolicense: true                    # automatically licenses Tower if license is provided
 ```
 
-There is also option to install Ansible Tower to the control node, and an option to license it.  If you want to license it you must copy a license called tower_license.json into this directory.
+If you want to license it you must copy a license called tower_license.json into this directory.  If you do not have a license already please request one using the [Workshop License Link](https://www.ansible.com/workshop-license).
 
 For a list of AWS availability zones please [refer to the documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html).
 
-```
-autolicense: true
-towerinstall: true
-```
 
-For an example, look at the following:
+For more examples, look at the following:
 - [sample-vars.yml](sample-vars.yml) - example for the Ansible Engine Workshop
 - [sample-vars.yml](sample-vars-networking.yml) - example for the Ansible Network Workshop
 - [sample-vars-auto.yml](sample-vars-auto.yml) - example for Tower installation and licensing
@@ -114,7 +116,7 @@ For an example, look at the following:
 
         ansible-playbook provision_lab.yml -e @extra_vars.yml
 
-What does the provisioner take care of automatically?
+What does the AWS provisioner take care of automatically?
 - AWS VPC creation (Amazon WebServices Virtual Private Cloud)
 - Creation of an SSH key pair (stored at ./ansible.pem)
   - This private key is installed automatically
@@ -123,9 +125,9 @@ What does the provisioner take care of automatically?
 - Creation of an internet gateway for the VPC
 - Creation of route table for VPC (for reachability from internet)
 
-4. Check on the EC2 console and you should see instances being created like:
+3. Check on the EC2 console and you should see instances being created like:
 
-        TRAININGLAB-student1-node1|2|3|ansible
+        TESTWORKSHOP-student1-node1|2|3|ansible
 
 ## Accessing student documentation and slides
 

diff --git a/provisioner/sample-vars-auto.yml b/provisioner/sample-vars-auto.yml
@@ -1,8 +1,8 @@
 ec2_region: us-east-1                 # region where the nodes will live
 ec2_name_prefix: TESTWORKSHOP         # name prefix for all the VMs
-admin_password: ansible               # password used for student account on control node
 student_total: 2                      # amount of work benches to provision
 ## Optional Variables
+admin_password: ansible               # password used for student account on control node
 localsecurity: false                  # skips firewalld installation and SE Linux when false
 create_login_page: true               # creates HTML website for workshop
 networking: true                      # workshop is put into networking mode, uses two Cisco IOS-XE devices

diff --git a/provisioner/sample-vars-networking.yml b/provisioner/sample-vars-networking.yml
@@ -1,8 +1,8 @@
 ec2_region: us-east-1                 # region where the nodes will live
 ec2_name_prefix: TESTWORKSHOP         # name prefix for all the VMs
-admin_password: ansible
-student_total: 2
+student_total: 2											# amount of work benches to provision
 ## Optional Variables
-localsecurity: false                   # skips firewalld installation and SE Linux when false
-create_login_page: true
-networking: true
+admin_password: ansible								# password used for student account on control node
+localsecurity: false                  # skips firewalld installation and SE Linux when false
+create_login_page: true								# creates HTML website for workshop
+networking: true											# workshop is put into networking mode, uses two Cisco IOS-XE devices
diff --git a/provisioner/sample-vars.yml b/provisioner/sample-vars.yml
@@ -1,7 +1,7 @@
 ec2_region: us-east-1                 # region where the nodes will live
 ec2_name_prefix: TESTWORKSHOP         # name prefix for all the VMs
-admin_password: ansible
-student_total: 2
+student_total: 2											# amount of work benches to provision
 ## Optional Variables
+admin_password: ansible								# password used for student account on control node
 localsecurity: false                   # skips firewalld installation and SE Linux when false
-create_login_page: true
+create_login_page: true									# creates HTML website for workshop