Merge pull request #6745 from shawn-hurley/secret-reg-auth

Automatic merge from submit-queue.

Bug 1509082 - Adding auth as a secret

If username and password are defined we should use a secret for the credentials.

roles/ansible_service_broker/tasks/install.yml

@@ -375,6 +375,11 @@
                   secret:
                     secretName: etcd-auth-secret
 
+- name: set auth name and type facts if needed
+  set_fact:
+    ansible_service_broker_registry_auth_type: "secret"
+    ansible_service_broker_registry_auth_name: "asb-registry-auth"
+  when: ansible_service_broker_registry_user != "" and ansible_service_broker_registry_password != ""
 
 # TODO: saw a oc_configmap in the library, but didn't understand how to get it to do the following:
 - name: Create config map for ansible-service-broker
@@ -402,6 +407,8 @@
                 org:  {{ ansible_service_broker_registry_organization }}
                 tag:  {{ ansible_service_broker_registry_tag }}
                 white_list: {{  ansible_service_broker_registry_whitelist | to_yaml }}
+                auth_type: "{{ ansible_service_broker_registry_auth_type | default("") }}"
+                auth_name: "{{ ansible_service_broker_registry_auth_name | default("") }}"
               - type: local_openshift
                 name: localregistry
                 namespaces: ['openshift']
@@ -447,6 +454,7 @@
         data: "{{ ansible_service_broker_registry_user }}"
       - path: password
         data: "{{ ansible_service_broker_registry_password }}"
+  when: ansible_service_broker_registry_user != "" and ansible_service_broker_registry_password != ""
 
 - name: Create the Broker resource in the catalog
   oc_obj: