removal of ec2_az requirement and provisioner documentation cleanup

we will default to az a (the letter A) for any provided aws region (e.g. us-east1 will default to us-east1a, us-east2 will be us-east2a, etc).
NetDevAutomate · Jun 27, 2018 · a625ca3 · a625ca3
1 parent fd6df8d
commit a625ca3
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 386 deletions.
diff --git a/provisioner/aws-directions/AWSHELP.md → docs/aws-directions/AWSHELP.md b/provisioner/aws-directions/AWSHELP.md → docs/aws-directions/AWSHELP.md
diff --git a/provisioner/aws-directions/add-user.png → docs/aws-directions/add-user.png b/provisioner/aws-directions/add-user.png → docs/aws-directions/add-user.png
diff --git a/provisioner/aws-directions/create-key.png → docs/aws-directions/create-key.png b/provisioner/aws-directions/create-key.png → docs/aws-directions/create-key.png
diff --git a/provisioner/aws-directions/ec2.png → docs/aws-directions/ec2.png b/provisioner/aws-directions/ec2.png → docs/aws-directions/ec2.png
diff --git a/provisioner/aws-directions/iam.png → docs/aws-directions/iam.png b/provisioner/aws-directions/iam.png → docs/aws-directions/iam.png
diff --git a/provisioner/aws-directions/login-window.png → docs/aws-directions/login-window.png b/provisioner/aws-directions/login-window.png → docs/aws-directions/login-window.png
diff --git a/provisioner/aws-directions/users.png → docs/aws-directions/users.png b/provisioner/aws-directions/users.png → docs/aws-directions/users.png
diff --git a/docs/faq.md b/docs/faq.md
@@ -37,33 +37,3 @@ Set your Access Key ID and Secret Access Key under ~/.aws/credentials
 aws_access_key_id = ABCDEFGHIJKLMNOP
 aws_secret_access_key = ABCDEFGHIJKLMNOP/ABCDEFGHIJKLMNOP
 ```
-
-### Problem: Not authorized for image
-
-```
-An exception occurred during task execution. To see the full traceback, use -vvv. The error was: ClientError: An error occurred (AuthFailure) when calling the DescribeImageAttribute operation: Not authorized for image:ami-26ebbc5c
-```
-
-#### Solution:
-
-Install latest dev of Ansible (will lock down specific version after 2.5 launches)
-
-```
-pip install git+https://github.com/ansible/ansible.git@devel
-```
-
-Refer to direction for Ansible Installation: http://docs.ansible.com/ansible/latest/intro_installation.html
-
-### Problem: no action detected in task
-
-```
-fatal: [localhost]: FAILED! => {"reason": "no action detected in task. This often indicates a misspelled module name, or incorrect module path.\n\nThe error appears to have been in '/home/ec2-user/linklight/provisioner/roles/manage_ec2_instances/tasks/provision.yml': line 264, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: find ami for ansible control node\n  ^ here\n\n\nThe error appears to have been in '/home/ec2-user/linklight/provisioner/roles/manage_ec2_instances/tasks/provision.yml': line 264, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: find ami for ansible control node\n  ^ here\n\nexception type: <class 'ansible.errors.AnsibleParserError'>\nexception: no action detected in task. This often indicates a misspelled module name, or incorrect module path.\n\nThe error appears to have been in '/home/ec2-user/linklight/provisioner/roles/manage_ec2_instances/tasks/provision.yml': line 264, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: find ami for ansible control node\n  ^ here\n"}
-```
-
-#### Solution:
-
-Install latest dev of Ansible (will lock down specific version after 2.5 launches)
-
-```
-pip install git+https://github.com/ansible/ansible.git@devel
-```
diff --git a/provisioner/network_quick_instructions.md → docs/network_quick_instructions.md b/provisioner/network_quick_instructions.md → docs/network_quick_instructions.md
diff --git a/provisioner/README.md b/provisioner/README.md
@@ -26,7 +26,7 @@ networking: true
 ### More Info on Networking Mode
 
 - Use the [samples-vars-networking.yml](samples-vars-networking.yml) as an example.  
-- [Quick instructions for networking mode can be found here](network_quick_instructions.md).
+- [Quick instructions for networking mode can be found here](../docs/network_quick_instructions.md).
 
 # Table Of Contents
 - [Requirements](#requirements)
@@ -58,7 +58,7 @@ To provision the workshop onto AWS use the following directions:
 
 2. Create an Access Key ID and Secret Access Key.  Save the ID and key for later.
 
-  - New to AWS and not sure what this step means?  [Click here](aws-directions/AWSHELP.md)
+  - New to AWS and not sure what this step means?  [Click here](../docs/aws-directions/AWSHELP.md)
 
 3. Install `boto` and `boto3`.
 
@@ -90,7 +90,6 @@ If you haven't done so already make sure you have the repo cloned to the machine
 
 ```yml
 ec2_region: us-east-1                 # region where the nodes will live
-ec2_az: us-east-1a                    # availability zone
 ec2_name_prefix: TRAININGLAB          # name prefix for all the VMs
 admin_password: ansible
 ## Optional Variables
@@ -99,15 +98,17 @@ localsecurity: false                   # skips firewalld installation and SE Lin
 
 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.
 
+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:
-- [sample-vars.yml](sample-vars.yml)
-- [sample-vars.yml](sample-vars-networking.yml)
-- [sample-vars-auto.yml](sample-vars-auto.yml)
+- [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
 
 2. Run the playbook: