Merge pull request #1063 from mazzystr/master

Updates for AWS ref arch

reference-architecture/3.9/playbooks/roles/aws/tasks/getec2ami.yaml

@@ -2,6 +2,7 @@
 - block:
     - name: Fetch Red Hat Cloud Access ami
       shell: aws ec2 describe-images \
+        --ouput=json \
         --region "{{ aws_region }}" --owners 309956199498 | \
         jq -r '.Images[] | [.Name,.ImageId] | @csv' | \
         sed -e 's/\"//g' | \
@@ -26,7 +27,7 @@
       debug:
         msg: "{{ notice.split('\n') }}"
       when: ec2ami_unformatted.changed
-      failed_when: "'ami-' not in ec2ami.stdout"
+      failed_when: ( ec2ami.stdout == "" ) or ( "'ami-' not in ec2ami.stdout" )
 
     - name: 'Set fact: ec2ami'
       set_fact:

reference-architecture/3.9/playbooks/roles/aws/templates/iam_policy_cpkuser.json.j2

@@ -3,7 +3,7 @@
     "Statement": [
         {
             "Action": [
-                "ec2:DescribeVolumes",
+                "ec2:DescribeVolume*",
                 "ec2:CreateVolume",
                 "ec2:CreateTags",
                 "ec2:DescribeInstances",