diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-23 16:06:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 16:06:12 -0400 |
| commit | 8256f836bae722f22564a6dc69ad2f9f52c84ed1 (patch) | |
| tree | 3467e3ee88431a50b73efe6c0db448ba4801ee78 | |
| parent | 74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5 (diff) | |
| parent | 7db5a580fc4cd61ddf4b2410ff608c4e30c7e976 (diff) | |
| download | openshift-8256f836bae722f22564a6dc69ad2f9f52c84ed1.tar.gz openshift-8256f836bae722f22564a6dc69ad2f9f52c84ed1.tar.bz2 openshift-8256f836bae722f22564a6dc69ad2f9f52c84ed1.tar.xz openshift-8256f836bae722f22564a6dc69ad2f9f52c84ed1.zip | |
Merge pull request #2073 from dgoodwin/preserve-images-uninstall
Allow flag to uninstall playbook to preserve images.
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_examples/files/examples/v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 3d6de2d17..4edd44fe4 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -143,11 +143,13 @@ - registry\.qe\.openshift\.com/.* - registry\.access\..*redhat\.com/rhel7/etcd - docker.io/openshift + when: openshift_uninstall_images | default(True) | bool - shell: "docker rmi -f {{ item.stdout_lines | join(' ') }}" changed_when: False failed_when: False with_items: "{{ images_to_delete.results }}" + when: openshift_uninstall_images | default(True) | bool - name: Remove sdn drop files file: diff --git a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml index 81da95064..032f94a18 100644 --- a/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml +++ b/roles/openshift_examples/files/examples/v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml @@ -97,7 +97,7 @@ parameters: name: HAWKULAR_METRICS_HOSTNAME required: true - - description: "Can be set to: 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process) + description: "Can be set to: 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process)" name: MODE value: "deploy" - |