From aaedcc69b5ce6943e74c893da05b44b2a83d6926 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 11 Jul 2016 16:55:49 -0400
Subject: Remove cleanup code from 1.0 to 1.1 upgrade era

---
 roles/openshift_examples/tasks/main.yml | 51 ---------------------------------
 1 file changed, 51 deletions(-)

(limited to 'roles')

diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml
index 4dc4cfb56..7ea39f51e 100644
--- a/roles/openshift_examples/tasks/main.yml
+++ b/roles/openshift_examples/tasks/main.yml
@@ -58,57 +58,6 @@
   failed_when: "'already exists' not in oex_import_infrastructure.stderr and oex_import_infrastructure.rc != 0"
   changed_when: false
 
-# The 1.1 release of the xpaas content for OpenShift renamed all the templates
-- name: Remove old xpaas templates from filesystem
-  file:
-    path: "{{ xpaas_templates_base }}/{{ item }}"
-    state: absent
-  with_items:
-    - amq6-persistent.json
-    - amq6.json
-    - eap6-amq-persistent-sti.json
-    - eap6-amq-sti.json
-    - eap6-basic-sti.json
-    - eap6-https-sti.json
-    - eap6-mongodb-persistent-sti.json
-    - eap6-mongodb-sti.json
-    - eap6-mysql-persistent-sti.json
-    - eap6-mysql-sti.json
-    - eap6-postgresql-persistent-sti.json
-    - eap6-postgresql-sti.json
-    - jws-tomcat7-basic-sti.json
-    - jws-tomcat7-https-sti.json
-    - jws-tomcat7-mongodb-sti.json
-    - jws-tomcat7-mongodb-persistent-sti.json
-    - jws-tomcat7-mysql-persistent-sti.json
-    - jws-tomcat7-mysql-sti.json
-    - jws-tomcat7-postgresql-persistent-sti.json
-    - jws-tomcat8-postgresql-persistent-sti.json
-    - jws-tomcat8-basic-sti.json
-    - jws-tomcat8-https-sti.json
-    - jws-tomcat8-mongodb-sti.json
-    - jws-tomcat8-mongodb-persistent-sti.json
-    - jws-tomcat8-mysql-sti.json
-    - jws-tomcat8-mysql-persistent-sti.json
-    - jws-tomcat8-postgresql-sti.json
-    - jws-tomcat7-postgresql-sti.json
-
-- name: Remove old xpaas templates from openshift namespace
-  command: >
-    {{ openshift.common.client_binary }} -n openshift delete
-    templates/amq6 templates/amq6-persistent templates/eap6-amq-persistent-sti templates/eap6-amq-sti \
-    templates/eap6-basic-sti templates/eap6-basic-sti templates/eap6-mongodb-persistent-sti templates/eap6-mongodb-sti \
-    templates/eap6-mysql-persistent-sti templates/eap6-mysql-sti templates/eap6-postgresql-persistent-sti \
-    templates/eap6-postgresql-sti templates/jws-tomcat7-basic-sti templates/jws-tomcat7-basic-sti \
-    templates/jws-tomcat7-mongodb-persistent-sti templates/jws-tomcat7-mongodb-sti \
-    templates/jws-tomcat7-mysql-persistent-sti templates/jws-tomcat7-mysql-sti \
-    templates/jws-tomcat7-postgresql-persistent-sti templates/jws-tomcat7-postgresql-sti \
-    templates/jws-tomcat8-basic-sti templates/jws-tomcat8-basic-sti templates/jws-tomcat8-mongodb-persistent-sti
-  when: openshift_examples_load_xpaas | bool
-  register: oex_delete_old_xpaas_templates
-  failed_when: "'not found' not in oex_delete_old_xpaas_templates.stderr and oex_delete_old_xpaas_templates.rc != 0"
-  changed_when: false
-
 - name: Import xPaas image streams
   command: >
     {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ xpaas_image_streams }}
-- 
cgit v1.2.3