From 6b1bdb2de51402d5d0800fcd0a5048418047cc27 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 22 Jun 2016 16:17:33 -0300
Subject: Allow flag to uninstall playbook to preserve images.
Default is still True, but allow devs to specify False in inventory to
avoid having to re-download all images. With upcoming changes the actual
images present on the system will have no effect on what gets run.
---
playbooks/adhoc/uninstall.yml | 2 ++
1 file changed, 2 insertions(+)
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:
--
cgit v1.2.3
From 7db5a580fc4cd61ddf4b2410ff608c4e30c7e976 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Thu, 23 Jun 2016 16:46:45 -0300
Subject: Add missing quote in metrics deployer template.
---
.../v1.2/infrastructure-templates/enterprise/metrics-deployer.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"
-
--
cgit v1.2.3