From dbc592e799fdcb2d8079548ea4e9cfc9e25b64c3 Mon Sep 17 00:00:00 2001
From: willtome <willtome@gmail.com>
Date: Tue, 22 Mar 2022 18:20:11 -0400
Subject: [PATCH] add blueprints

---
 cloud/blueprints/linux.yml                                | 2 --
 cloud/blueprints/rhel7.yml                                | 7 +++++++
 cloud/blueprints/rhel8.yml                                | 7 +++++++
 cloud/blueprints/windows.yml                              | 6 +++---
 .../demo/cloud/roles/aws/defaults/main.yml                | 8 +++++---
 .../demo/cloud/roles/aws/tasks/create_vm.yml              | 4 +++-
 cloud/setup.yml                                           | 3 +++
 7 files changed, 28 insertions(+), 9 deletions(-)
 delete mode 100644 cloud/blueprints/linux.yml
 create mode 100644 cloud/blueprints/rhel7.yml
 create mode 100644 cloud/blueprints/rhel8.yml

diff --git a/cloud/blueprints/linux.yml b/cloud/blueprints/linux.yml
deleted file mode 100644
index 7b3ee54..0000000
--- a/cloud/blueprints/linux.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-vm_providers: []
\ No newline at end of file
diff --git a/cloud/blueprints/rhel7.yml b/cloud/blueprints/rhel7.yml
new file mode 100644
index 0000000..8739d89
--- /dev/null
+++ b/cloud/blueprints/rhel7.yml
@@ -0,0 +1,7 @@
+---
+vm_providers:
+  - aws
+aws_image_owners: 309956199498
+aws_instance_size: t2.medium
+aws_image_architecture: x86_64
+aws_image_filter: 'RHEL-7.9_HVM*'
\ No newline at end of file
diff --git a/cloud/blueprints/rhel8.yml b/cloud/blueprints/rhel8.yml
new file mode 100644
index 0000000..cb94a93
--- /dev/null
+++ b/cloud/blueprints/rhel8.yml
@@ -0,0 +1,7 @@
+---
+vm_providers:
+  - aws
+aws_image_owners: 309956199498
+aws_instance_size: t3.micro
+aws_image_architecture: x86_64
+aws_image_filter: 'RHEL-8*HVM-*Hourly*'
\ No newline at end of file
diff --git a/cloud/blueprints/windows.yml b/cloud/blueprints/windows.yml
index d7085e9..7e4730d 100644
--- a/cloud/blueprints/windows.yml
+++ b/cloud/blueprints/windows.yml
@@ -1,6 +1,6 @@
 ---
 vm_blueprint_providers:
  - aws
-vm_blueprint_aws_instance_filter: 'Windows_Server-2019-English-Core-Base*'
-vm_blueprint_aws_instance_size: t3.medium
-vm_blueprint_aws_userdata_template: aws_windows_userdata
\ No newline at end of file
+aws_instance_filter: 'Windows_Server-2019-English-Core-Base*'
+aws_instance_size: t3.medium
+aws_userdata_template: aws_windows_userdata
\ No newline at end of file
diff --git a/cloud/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml b/cloud/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml
index e2d1978..702a838 100644
--- a/cloud/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml
+++ b/cloud/collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml
@@ -10,9 +10,11 @@ aws_region: us-east-1
 aws_vm_name: "{{ vm_name }}"
 aws_vm_owner: "{{ vm_owner }}"
 aws_blueprint: "{{ vm_blueprint }}"
-aws_instance_filter: "{{ vm_blueprint_aws_instance_filter }}"
-aws_instance_size: "{{ vm_blueprint_aws_instance_size }}"
-aws_userdata_template: "{{ vm_blueprint_aws_userdata_template }}"
+aws_image_filter: "{{ omit }}"
+aws_image_size: "{{ omit }}"
+aws_image_architecture: "{{ omit }}"
+aws_image_owners: "{{ omit }} "
+aws_userdata_template: "{{ omit }}"
 aws_keypair_name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-demo-key"
 aws_securitygroup_name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-sec-group"
 aws_env_tag: prod
diff --git a/cloud/collections/ansible_collections/demo/cloud/roles/aws/tasks/create_vm.yml b/cloud/collections/ansible_collections/demo/cloud/roles/aws/tasks/create_vm.yml
index 090f65a..14fea99 100644
--- a/cloud/collections/ansible_collections/demo/cloud/roles/aws/tasks/create_vm.yml
+++ b/cloud/collections/ansible_collections/demo/cloud/roles/aws/tasks/create_vm.yml
@@ -13,8 +13,10 @@
 - name: AWS| CREATE VM | find ami
   amazon.aws.ec2_ami_info:
     region: "{{ aws_region }}"
+    owners: "{{ aws_image_owner }}"
     filters:
-      name: "{{ aws_instance_filter }}"
+      name: "{{ aws_image_filter }}"
+      architecture: "{{ aws_image_architecture }}"
   register: amis
 
 - name: AWS| CREATE VM | save ami
diff --git a/cloud/setup.yml b/cloud/setup.yml
index 62684ef..c4c5c80 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -1,6 +1,7 @@
 ---
 user_message:
  - Update AWS credential with Access and Secret key
+ - Update Workshop Credential with password used to login to Controller
 
 controller_components:
   - credentials
@@ -109,3 +110,5 @@ controller_templates:
           required: true
           choices: #"{{ lookup('fileglob', 'blueprints/*.yml') | regex_replace(',','\n') | regex_findall('.*/(.*)(?=.yml)') | list }}"
             - windows
+            - rhel8
+            - rhel7