From e59ab987dc732d2512ea0dd681deeb52fb80b169 Mon Sep 17 00:00:00 2001 From: Fabian von Feilitzsch Date: Fri, 23 Jun 2017 10:36:29 -0400 Subject: fix yamllint issues --- .../tasks/install.yml | 65 ---------------------- .../tasks/main.yml | 6 -- .../tasks/remove.yml | 19 ------- 3 files changed, 90 deletions(-) delete mode 100644 roles/openshift_service_catalog_broker/tasks/install.yml delete mode 100644 roles/openshift_service_catalog_broker/tasks/main.yml delete mode 100644 roles/openshift_service_catalog_broker/tasks/remove.yml (limited to 'roles/openshift_service_catalog_broker/tasks') diff --git a/roles/openshift_service_catalog_broker/tasks/install.yml b/roles/openshift_service_catalog_broker/tasks/install.yml deleted file mode 100644 index c9dad678a..000000000 --- a/roles/openshift_service_catalog_broker/tasks/install.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- -# do any asserts here - -- name: Set default image variables based on deployment_type - include_vars: "{{ item }}" - with_first_found: - - "{{ openshift_deployment_type | default(deployment_type) }}.yml" - - "default_images.yml" - -- name: Set service_catalog image facts - set_fact: - openshift_service_catalog_broker_image_prefix: "{{ openshift_service_catalog_broker_image_prefix | default(__openshift_service_catalog_broker_image_prefix) }}" - openshift_service_catalog_broker_image_version: "{{ openshift_service_catalog_broker_image_version | default(__openshift_service_catalog_broker_image_version) }}" - -- name: Set Service Catalog Broker namespace - oc_project: - state: present - name: "{{ openshift_service_catalog_broker_namespace }}" -# node_selector: "{{ openshift_service_catalog_broker_nodeselector | default(null) }}" - -- name: Create temp directory for doing work in - command: mktemp -d /tmp/openshift-broker-ansible-XXXXXX - register: mktemp - changed_when: False - -## broker process deployment -- template: - src: broker.j2 - dest: "{{ mktemp.stdout }}/broker.yml" - vars: - image: "" - replicas: 1 - node_selector: "" - cpu_limit: none - memory_limit: none - -- name: Set Service Catalog Broker deployment - oc_obj: - state: present - namespace: "{{ openshift_service_catalog_broker_namespace }}" - kind: deployment - name: ups-broker - files: - - "{{ mktemp.stdout }}/broker.yml" - delete_after: yes - -- template: - src: broker_service.j2 - dest: "{{ mktemp.stdout }}/broker_service.yml" - -- name: Set Service Catalog Broker service - oc_obj: - state: present - namespace: "{{ openshift_service_catalog_broker_namespace }}" - kind: service - name: ups-broker - files: - - "{{ mktemp.stdout }}/broker_service.yml" - delete_after: yes - -- name: Delete temp directory - file: - name: "{{ mktemp.stdout }}" - state: absent - changed_when: False diff --git a/roles/openshift_service_catalog_broker/tasks/main.yml b/roles/openshift_service_catalog_broker/tasks/main.yml deleted file mode 100644 index 4d776f543..000000000 --- a/roles/openshift_service_catalog_broker/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- include: install.yml - when: not openshift_service_catalog_broker_remove | default(false) | bool - -- include: remove.yml - when: openshift_service_catalog_broker_remove | default(false) | bool diff --git a/roles/openshift_service_catalog_broker/tasks/remove.yml b/roles/openshift_service_catalog_broker/tasks/remove.yml deleted file mode 100644 index a0574fd55..000000000 --- a/roles/openshift_service_catalog_broker/tasks/remove.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: Remove Service Catalog Broker service - oc_obj: - state: absent - namespace: "{{ openshift_service_catalog_broker_namespace }}" - kind: service - name: ups-broker - -- name: Remove Service Catalog Broker deployment - oc_obj: - state: absent - namespace: "{{ openshift_service_catalog_broker_namespace }}" - kind: deployment - name: ups-broker - -- name: Remove Service Catalog Broker namespace - oc_project: - state: absent - name: "{{ openshift_service_catalog_broker_namespace }}" -- cgit v1.2.3