diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-26 14:37:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 14:37:14 -0400 |
| commit | f1efd8d8318bf6c306ef6f61c2317325670672fc (patch) | |
| tree | ad84cec087da8a9d70cf6d00d431b864805c1183 | |
| parent | 070e0002ea820c68445f6bb85b97766086854d57 (diff) | |
| parent | 23c370fd192b374eacc893b08bb090933b277522 (diff) | |
| download | openshift-f1efd8d8318bf6c306ef6f61c2317325670672fc.tar.gz openshift-f1efd8d8318bf6c306ef6f61c2317325670672fc.tar.bz2 openshift-f1efd8d8318bf6c306ef6f61c2317325670672fc.tar.xz openshift-f1efd8d8318bf6c306ef6f61c2317325670672fc.zip | |
Merge pull request #5885 from kwoodson/fix_image_clean
Moving removal of unwanted artifacts to image_prep.
| -rw-r--r-- | playbooks/common/openshift-node/clean_image.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/image_prep.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/seal_ami.yml | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/playbooks/common/openshift-node/clean_image.yml b/playbooks/common/openshift-node/clean_image.yml new file mode 100644 index 000000000..38753d0af --- /dev/null +++ b/playbooks/common/openshift-node/clean_image.yml @@ -0,0 +1,10 @@ +--- +- name: Configure nodes + hosts: oo_nodes_to_config:!oo_containerized_master_nodes + tasks: + - name: Remove any ansible facts created during AMI creation + file: + path: "/etc/ansible/facts.d/{{ item }}" + state: absent + with_items: + - openshift.fact diff --git a/playbooks/common/openshift-node/image_prep.yml b/playbooks/common/openshift-node/image_prep.yml index 00d167c22..30651a1df 100644 --- a/playbooks/common/openshift-node/image_prep.yml +++ b/playbooks/common/openshift-node/image_prep.yml @@ -19,3 +19,6 @@ - name: Re-enable excluders include: enable_excluders.yml + +- name: Remove any undesired artifacts from build + include: clean_image.yml diff --git a/roles/openshift_aws/tasks/seal_ami.yml b/roles/openshift_aws/tasks/seal_ami.yml index d319fdd1a..0cb749dcc 100644 --- a/roles/openshift_aws/tasks/seal_ami.yml +++ b/roles/openshift_aws/tasks/seal_ami.yml @@ -1,11 +1,4 @@ --- -- name: Remove any ansible facts created during AMI creation - file: - path: "/etc/ansible/facts.d/{{ item }}" - state: absent - with_items: - - openshift.fact - - name: fetch newly created instances ec2_remote_facts: region: "{{ openshift_aws_region }}" |