summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaebler <staebler@redhat.com>2017-10-18 22:38:33 -0400
committerstaebler <staebler@redhat.com>2017-10-22 14:31:04 -0400
commit1f9546df88b0ade2f5af1577e62833d5a4ce1976 (patch)
treec10e6a5b9a6e8708a9a69c132704f9096eccb373
parentdfe27c1ffdd9f9590552c5b274a2d09de5d0e377 (diff)
downloadopenshift-1f9546df88b0ade2f5af1577e62833d5a4ce1976.tar.gz
openshift-1f9546df88b0ade2f5af1577e62833d5a4ce1976.tar.bz2
openshift-1f9546df88b0ade2f5af1577e62833d5a4ce1976.tar.xz
openshift-1f9546df88b0ade2f5af1577e62833d5a4ce1976.zip
Fix a few small issues in service catalog uninstall
-rw-r--r--roles/ansible_service_broker/tasks/remove.yml12
-rw-r--r--roles/openshift_service_catalog/tasks/generate_certs.yml10
-rw-r--r--roles/openshift_service_catalog/tasks/remove.yml7
3 files changed, 23 insertions, 6 deletions
diff --git a/roles/ansible_service_broker/tasks/remove.yml b/roles/ansible_service_broker/tasks/remove.yml
index f0a6be226..51b86fb26 100644
--- a/roles/ansible_service_broker/tasks/remove.yml
+++ b/roles/ansible_service_broker/tasks/remove.yml
@@ -85,9 +85,9 @@
- name: remove secret for broker auth
oc_obj:
- name: asb-auth-secret
+ name: asb-client
namespace: openshift-ansible-service-broker
- kind: Broker
+ kind: Secret
state: absent
# TODO: saw a oc_configmap in the library, but didn't understand how to get it to do the following:
@@ -99,11 +99,17 @@
kind: ConfigMap
# TODO: Is this going to work?
+- shell: >
+ oc get apiservices.apiregistration.k8s.io/v1beta1.servicecatalog.k8s.io -n kube-service-catalog || echo "not found"
+ register: get_apiservices
+ changed_when: no
+
- name: remove broker object from the catalog
oc_obj:
name: ansible-service-broker
state: absent
- kind: ServiceBroker
+ kind: ClusterServiceBroker
+ when: not "'not found' in get_apiservices.stdout"
- name: remove openshift-ansible-service-broker project
oc_project:
diff --git a/roles/openshift_service_catalog/tasks/generate_certs.yml b/roles/openshift_service_catalog/tasks/generate_certs.yml
index 416bdac70..9d55185c8 100644
--- a/roles/openshift_service_catalog/tasks/generate_certs.yml
+++ b/roles/openshift_service_catalog/tasks/generate_certs.yml
@@ -16,6 +16,16 @@
--key={{ generated_certs_dir }}/ca.key --cert={{ generated_certs_dir }}/ca.crt
--serial={{ generated_certs_dir }}/apiserver.serial.txt --name=service-catalog-signer
+- name: Delete old apiserver.crt
+ file:
+ path: "{{ generated_certs_dir }}/apiserver.crt"
+ state: absent
+
+- name: Delete old apiserver.key
+ file:
+ path: "{{ generated_certs_dir }}/apiserver.key"
+ state: absent
+
- name: Generating server keys
oc_adm_ca_server_cert:
cert: "{{ generated_certs_dir }}/apiserver.crt"
diff --git a/roles/openshift_service_catalog/tasks/remove.yml b/roles/openshift_service_catalog/tasks/remove.yml
index 96ae61507..e473313b9 100644
--- a/roles/openshift_service_catalog/tasks/remove.yml
+++ b/roles/openshift_service_catalog/tasks/remove.yml
@@ -3,9 +3,10 @@
command: >
oc delete apiservices.apiregistration.k8s.io/v1beta1.servicecatalog.k8s.io --ignore-not-found -n kube-service-catalog
-- name: Remove Policy Binding
- command: >
- oc delete policybindings/kube-system:default -n kube-system --ignore-not-found
+# TODO: policybinding is not a resource type. what was the original intention of this?
+#- name: Remove Policy Binding
+# command: >
+# oc delete policybindings/kube-system:default -n kube-system --ignore-not-found
# TODO: this module doesn't currently remove this
#- name: Remove service catalog api service