Updating AMI copying tags to no longer default to parent AMI.

roles/openshift_aws/defaults/main.yml

@@ -34,6 +34,8 @@ openshift_aws_launch_config_bootstrap_token: ''
 
 openshift_aws_users: []
 
+openshift_aws_copy_base_ami_tags: False
+
 openshift_aws_ami_tags:
   bootstrap: "true"
   openshift-created: "true"

roles/openshift_aws/tasks/seal_ami.yml

@@ -10,18 +10,20 @@
   delay: 3
   until: instancesout.instances|length > 0
 
-- name: fetch the ami used to create the instance
-  ec2_ami_find:
-    region: "{{ openshift_aws_region }}"
-    ami_id: "{{ instancesout.instances[0]['image_id'] }}"
-  register: original_ami_out
-  retries: 20
-  delay: 3
-  until: original_ami_out.results|length > 0
+- when: openshift_aws_copy_base_ami_tags | default(False) | bool
+  block:
+  - name: fetch the ami used to create the instance
+    ec2_ami_find:
+      region: "{{ openshift_aws_region }}"
+      ami_id: "{{ instancesout.instances[0]['image_id'] }}"
+    register: original_ami_out
+    retries: 20
+    delay: 3
+    until: original_ami_out.results|length > 0
 
-- name: combine the tags of the original ami with newly created ami
-  set_fact:
-    l_openshift_aws_ami_tags: "{{ original_ami_out.results[0]['tags'] | combine(openshift_aws_ami_tags) }}"
+  - name: combine the tags of the original ami with newly created ami
+    set_fact:
+      l_openshift_aws_ami_tags: "{{ original_ami_out.results[0]['tags'] | combine(openshift_aws_ami_tags) }}"
 
 - name: bundle ami
   ec2_ami:
@@ -30,7 +32,7 @@
     state: present
     description: "This was provisioned {{ ansible_date_time.iso8601 }}"
     name: "{{ openshift_aws_ami_name }}"
-    tags: "{{ l_openshift_aws_ami_tags }}"
+    tags: "{{ l_openshift_aws_ami_tags if l_openshift_aws_ami_tags is defined and l_openshift_aws_ami_tags != {} else openshift_aws_ami_tags }}"
     wait: yes
   register: amioutput