Merge pull request #87 from jillr/PR64

Fixes for Controller support
redhat-cop · Aug 28, 2023 · 89c16e3 · 89c16e3
2 parents 620edfa + c231ba0
commit 89c16e3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/changelogs/fragments/20230817-update_for_controller.yml b/changelogs/fragments/20230817-update_for_controller.yml
@@ -0,0 +1,4 @@
+trivial:
+  - "Update playbooks that include credentials to be able to be used with Automation Controller (not just the command line)"
+bugfixes:
+  - Update playbooks that include credentials to be able to be used with Automation Controller (not just the command line).  https://github.com/redhat-cop/cloud.aws_ops/pull/64
diff --git a/playbooks/webapp/migrate_webapp.yaml b/playbooks/webapp/migrate_webapp.yaml
@@ -8,8 +8,8 @@
 
   module_defaults:
     group/aws:
-      aws_access_key: "{{ aws_access_key }}"
-      aws_secret_key: "{{ aws_secret_key }}"
+      aws_access_key: "{{ aws_access_key | default(omit) }}"
+      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
 
   tasks:

diff --git a/playbooks/webapp/tasks/create.yaml b/playbooks/webapp/tasks/create.yaml
@@ -6,8 +6,8 @@
 - name: Create resources playbook
   module_defaults:
     group/aws:
-      aws_access_key: "{{ aws_access_key }}"
-      aws_secret_key: "{{ aws_secret_key }}"
+      aws_access_key: "{{ aws_access_key | default(omit) }}"
+      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ region }}"
 

diff --git a/playbooks/webapp/tasks/delete.yaml b/playbooks/webapp/tasks/delete.yaml
@@ -2,8 +2,8 @@
 - name: Delete resources playbook
   module_defaults:
     group/aws:
-      aws_access_key: "{{ aws_access_key }}"
-      aws_secret_key: "{{ aws_secret_key }}"
+      aws_access_key: "{{ aws_access_key | default(omit) }}"
+      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ region | default(aws_region) }}"
 

diff --git a/playbooks/webapp/tasks/deploy_app.yaml b/playbooks/webapp/tasks/deploy_app.yaml
@@ -31,8 +31,8 @@
 - name: Create Cloud Resources (workers, load balancer, etc)
   module_defaults:
     group/aws:
-      aws_access_key: "{{ aws_access_key }}"
-      aws_secret_key: "{{ aws_secret_key }}"
+      aws_access_key: "{{ aws_access_key | default(omit) }}"
+      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ region | default(aws_region) }}"
 

diff --git a/playbooks/webapp/vars/main.yaml b/playbooks/webapp/vars/main.yaml
@@ -48,7 +48,7 @@ rds_allocated_storage_gb: 20
 rds_instance_class: db.m6g.large
 rds_instance_name: mysampledb123
 rds_engine: postgres
-rds_engine_version: "14.2"
+rds_engine_version: "14.8"
 rds_master_password: L#5cH2mgy_
 rds_master_user: ansible
 

diff --git a/playbooks/webapp/webapp.yaml b/playbooks/webapp/webapp.yaml
@@ -21,8 +21,8 @@
 
   module_defaults:
     group/aws:
-      aws_access_key: "{{ aws_access_key }}"
-      aws_secret_key: "{{ aws_secret_key }}"
+      aws_access_key: "{{ aws_access_key | default(omit) }}"
+      aws_secret_key: "{{ aws_secret_key | default(omit) }}"
       security_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"