Merge branch 'master' into mbruzek-openshift-openstack

3 files changed, 20 insertions, 2 deletions

diff --git a/roles/ansible_service_broker/meta/main.yml b/roles/ansible_service_broker/meta/main.yml
index ec4aafb79..65b736500 100644
--- a/roles/ansible_service_broker/meta/main.yml
+++ b/roles/ansible_service_broker/meta/main.yml
@@ -12,4 +12,5 @@ galaxy_info:
   categories:
   - cloud
 dependencies:
+- role: lib_utils
 - role: lib_openshift
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index 4ca47d074..f869b5fae 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -4,7 +4,7 @@
 - name: Set default image variables based on deployment type
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ openshift_deployment_type | default(deployment_type) }}.yml"
+    - "{{ openshift_deployment_type }}.yml"
     - "default_images.yml"
 
 - name: set ansible_service_broker facts
@@ -72,6 +72,15 @@
       - apiGroups: ["image.openshift.io", ""]
         resources: ["images"]
         verbs: ["get", "list"]
+      - apiGroups: ["network.openshift.io"]
+        resources: ["clusternetworks", "netnamespaces"]
+        verbs: ["get"]
+      - apiGroups: ["network.openshift.io"]
+        resources: ["netnamespaces"]
+        verbs: ["update"]
+      - apiGroups: ["networking.k8s.io"]
+        resources: ["networkpolicies"]
+        verbs: ["create", "delete"]
 
 - name: Create asb-access cluster role
   oc_clusterrole:
@@ -366,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
@@ -393,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']
@@ -438,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:
diff --git a/roles/ansible_service_broker/vars/default_images.yml b/roles/ansible_service_broker/vars/default_images.yml
index 248e0363d..0ed1d9674 100644
--- a/roles/ansible_service_broker/vars/default_images.yml
+++ b/roles/ansible_service_broker/vars/default_images.yml
@@ -1,6 +1,6 @@
 ---
 
-__ansible_service_broker_image_prefix: ansibleplaybookbundle/
+__ansible_service_broker_image_prefix: ansibleplaybookbundle/origin-
 __ansible_service_broker_image_tag: latest
 
 __ansible_service_broker_etcd_image_prefix: quay.io/coreos/