Allow external ups service

Dockerfile

@@ -2,42 +2,49 @@ FROM ansibleplaybookbundle/apb-base
 
 LABEL "com.redhat.apb.spec"=\
 "dmVyc2lvbjogMS4wCm5hbWU6IHVuaWZpZWRwdXNoLWFwYgpkZXNjcmlwdGlvbjogQWVyb0dlYXIg\
-VW5pZmllZFB1c2ggU2VydmVyCmJpbmRhYmxlOiBUcnVlCmFzeW5jOiBvcHRpb25hbAp0YWdzOiAK\
-ICAtIG1vYmlsZS1zZXJ2aWNlCiAgLSBtb2JpbGUtY2xpZW50LWVuYWJsZWQKbWV0YWRhdGE6CiAg\
-ZGlzcGxheU5hbWU6IFVuaWZpZWQgUHVzaCBTZXJ2ZXIKICBsb25nRGVzY3JpcHRpb246ICJBbiBB\
-UEIgZGVwbG95aW5nIHRoZSBBZXJvR2VhciBVbmlmaWVkUHVzaCBTZXJ2ZXIgd2l0aCBwZXJzaXN0\
-ZW50IHN0b3JhZ2UgYW5kIGF1dGhlbnRpY2F0aW9uIHRocm91Z2ggT3BlbnNoaWZ0IgogIGltYWdl\
-VXJsOiAiaHR0cHM6Ly9wYnMudHdpbWcuY29tL3Byb2ZpbGVfaW1hZ2VzLzE3OTQ0NDAwMDUvYWVy\
-b2dlYXJfaWNvbi0xXzQwMHg0MDAucG5nIgogIGRvY3VtZW50YXRpb25Vcmw6ICJodHRwczovL2dp\
-dGh1Yi5jb20vYWVyb2dlYXJjYXRhbG9nL3VuaWZpZWRwdXNoLWFwYi9ibG9iL21hc3Rlci9kb2Nz\
-L21vZHVsZXMvdXBzX29wZW5zaGlmdC9pbmRleC5hc2NpaWRvYyIKICBwcm92aWRlckRpc3BsYXlO\
-YW1lOiAiUmVkIEhhdCwgSW5jLiIKICBkZXBlbmRlbmNpZXM6CiAgICAtICJkb2NrZXIuaW8vYWVy\
-b2dlYXIvdW5pZmllZHB1c2gtd2lsZGZseS1wbGFpbjoyLjEuMCIKICAgIC0gImRvY2tlci5pby9j\
-ZW50b3MvcG9zdGdyZXNxbC05Ni1jZW50b3M3OjkuNiIKICAgIC0gImRvY2tlci5pby9hZXJvZ2Vh\
-ci91cHMtY29uZmlnLW9wZXJhdG9yOm1hc3RlciIKICAgIC0gImRvY2tlci5pby9vcGVuc2hpZnQv\
-b2F1dGgtcHJveHk6djEuMS4wIgogIHNlcnZpY2VOYW1lOiB1cHMKcGxhbnM6CiAgLSBuYW1lOiBk\
-ZWZhdWx0CiAgICBkZXNjcmlwdGlvbjogUGVyc2lzdGVudCBkZXBsb3ltZW50IG9mIFVQUwogICAg\
-ZnJlZTogVHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIG1vYmlsZWNsaWVudF9iaW5kX3BhcmFtZXRl\
-cnNfZGF0YToKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVlIjogIm1ldGFk\
-YXRhLm5hbWUiLCAidHlwZSI6ICJwYXRoIn0nCiAgICBwYXJhbWV0ZXJzOiBbXQogICAgYmluZF9w\
-YXJhbWV0ZXJzOgogICAgLSBuYW1lOiBDTElFTlRfSUQKICAgICAgcmVxdWlyZWQ6IFRydWUKICAg\
-ICAgdGl0bGU6IE1vYmlsZSBDbGllbnQgSUQKICAgICAgdHlwZTogc3RyaW5nCiAgICAtIG5hbWU6\
-IENMSUVOVF9UWVBFCiAgICAgIHJlcXVpcmVkOiBUcnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgQ2xp\
-ZW50IFR5cGUKICAgICAgdHlwZTogZW51bQogICAgICBkZWZhdWx0OiAiQW5kcm9pZCIKICAgICAg\
-ZW51bTogWyJBbmRyb2lkIiwgIklPUyJdCiAgICAtIG5hbWU6IGdvb2dsZWtleQogICAgICB0aXRs\
-ZTogWW91ciBHb29nbGUgS2V5IGZvciBGaXJlYmFzZSBDbG91ZCBNZXNzYWdpbmcKICAgICAgdHlw\
-ZTogc3RyaW5nCiAgICAgIGRpc3BsYXlfZ3JvdXA6IEFuZHJvaWQKICAgIC0gbmFtZTogcHJvamVj\
-dE51bWJlcgogICAgICB0aXRsZTogWW91ciBGQ00gUHJvamVjdCBOdW1iZXIsIG5lZWRlZCBvbiB0\
-aGUgbW9iaWxlIGNsaWVudCBmb3IgY29ubmVjdGluZyB3aXRoIEZDTQogICAgICB0eXBlOiBzdHJp\
-bmcKICAgICAgZGlzcGxheV9ncm91cDogQW5kcm9pZAogICAgLSBuYW1lOiBjZXJ0CiAgICAgIHRp\
-dGxlOiBpT1MgLnAxMiBmaWxlIChlbmNvZGUgY29udGVudHMgaW4gYmFzZTY0IGJlZm9yZSBwYXN0\
-aW5nKQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgZGlzcGxheV90eXBlOiB0ZXh0YXJlYQogICAg\
-ICBkaXNwbGF5X2dyb3VwOiBpT1MKICAgIC0gbmFtZTogcGFzc3BocmFzZQogICAgICB0aXRsZTog\
-VGhlIHBhc3NwaHJhc2UKICAgICAgdHlwZTogc3RyaW5nCiAgICAgIGRpc3BsYXlfdHlwZTogcGFz\
-c3dvcmQKICAgICAgZGlzcGxheV9ncm91cDogaU9TCiAgICAtIG5hbWU6IGlvc0lzUHJvZHVjdGlv\
-bgogICAgICB0aXRsZTogSXMgdGhpcyBhIHByb2R1Y3Rpb24gY2VydGlmaWNhdGU/CiAgICAgIGRl\
-ZmF1bHQ6IGZhbHNlCiAgICAgIHR5cGU6IGJvb2xlYW4KICAgICAgZGlzcGxheV90eXBlOiBjaGVj\
-a2JveAogICAgICBkaXNwbGF5X2dyb3VwOiBpT1MK"
+VW5pZmllZFB1c2ggU2VydmVyIFRlc3QKYmluZGFibGU6IFRydWUKYXN5bmM6IG9wdGlvbmFsCnRh\
+Z3M6IAogIC0gbW9iaWxlLXNlcnZpY2UKICAtIG1vYmlsZS1jbGllbnQtZW5hYmxlZAptZXRhZGF0\
+YToKICBkaXNwbGF5TmFtZTogVW5pZmllZCBQdXNoIFNlcnZlciBEZXYKICBsb25nRGVzY3JpcHRp\
+b246ICJBbiBBUEIgZGVwbG95aW5nIHRoZSBBZXJvR2VhciBVbmlmaWVkUHVzaCBTZXJ2ZXIgd2l0\
+aCBwZXJzaXN0ZW50IHN0b3JhZ2UgYW5kIGF1dGhlbnRpY2F0aW9uIHRocm91Z2ggT3BlbnNoaWZ0\
+IgogIGltYWdlVXJsOiAiaHR0cHM6Ly9wYnMudHdpbWcuY29tL3Byb2ZpbGVfaW1hZ2VzLzE3OTQ0\
+NDAwMDUvYWVyb2dlYXJfaWNvbi0xXzQwMHg0MDAucG5nIgogIGRvY3VtZW50YXRpb25Vcmw6ICJo\
+dHRwczovL2dpdGh1Yi5jb20vYWVyb2dlYXJjYXRhbG9nL3VuaWZpZWRwdXNoLWFwYi9ibG9iL21h\
+c3Rlci9kb2NzL21vZHVsZXMvdXBzX29wZW5zaGlmdC9pbmRleC5hc2NpaWRvYyIKICBwcm92aWRl\
+ckRpc3BsYXlOYW1lOiAiUmVkIEhhdCwgSW5jLiIKICBkZXBlbmRlbmNpZXM6CiAgICAtICJkb2Nr\
+ZXIuaW8vYWVyb2dlYXIvdW5pZmllZHB1c2gtd2lsZGZseS1wbGFpbjoyLjEuMCIKICAgIC0gImRv\
+Y2tlci5pby9jZW50b3MvcG9zdGdyZXNxbC05Ni1jZW50b3M3OjkuNiIKICAgIC0gImRvY2tlci5p\
+by9hZXJvZ2Vhci91cHMtY29uZmlnLW9wZXJhdG9yOm1hc3RlciIKICAgIC0gImRvY2tlci5pby9v\
+cGVuc2hpZnQvb2F1dGgtcHJveHk6djEuMS4wIgogIHNlcnZpY2VOYW1lOiB1cHMKcGxhbnM6CiAg\
+LSBuYW1lOiBkZWZhdWx0CiAgICBkZXNjcmlwdGlvbjogUGVyc2lzdGVudCBkZXBsb3ltZW50IG9m\
+IFVQUwogICAgZnJlZTogVHJ1ZQogICAgbWV0YWRhdGE6CiAgICAgIG1vYmlsZWNsaWVudF9iaW5k\
+X3BhcmFtZXRlcnNfZGF0YToKICAgICAgICAtICd7Im5hbWUiOiAiQ0xJRU5UX0lEIiwgInZhbHVl\
+IjogIm1ldGFkYXRhLm5hbWUiLCAidHlwZSI6ICJwYXRoIn0nCiAgICBwYXJhbWV0ZXJzOiAKICAg\
+IC0gbmFtZTogU0hBUkVEX1VQUwogICAgICByZXF1aXJlZDogRmFsc2UKICAgICAgdHlwZTogYm9v\
+bAogICAgICB0aXRsZTogQ29ubmVjdCB0byBhbiBleGlzdGluZyBVUFMgCiAgICAtIG5hbWU6IFNI\
+QVJFRF9IT1NUCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAg\
+dGl0bGU6IFVSTCBvZiB0aGUgc2hhcmVkIFVQUyBzZXJ2aWNlCiAgICAtIG5hbWU6IFNIQVJFRF9I\
+T1NUX1RPS0VOCiAgICAgIHJlcXVpcmVkOiBGYWxzZQogICAgICB0eXBlOiBzdHJpbmcKICAgICAg\
+dGl0bGU6IEF1dGggdG9rZW4gZm9yIHRoZSBzaGFyZWQgVVBTIHNlcnZpY2UgLSBMZWF2ZSBibGFu\
+ayBpZiBub3QgdXNpbmcgc2hhcmVkIFVQUwogICAgYmluZF9wYXJhbWV0ZXJzOgogICAgLSBuYW1l\
+OiBDTElFTlRfSUQKICAgICAgcmVxdWlyZWQ6IFRydWUKICAgICAgdGl0bGU6IE1vYmlsZSBDbGll\
+bnQgSUQKICAgICAgdHlwZTogc3RyaW5nCiAgICAtIG5hbWU6IENMSUVOVF9UWVBFCiAgICAgIHJl\
+cXVpcmVkOiBUcnVlCiAgICAgIHRpdGxlOiBNb2JpbGUgQ2xpZW50IFR5cGUKICAgICAgdHlwZTog\
+ZW51bQogICAgICBkZWZhdWx0OiAiQW5kcm9pZCIKICAgICAgZW51bTogWyJBbmRyb2lkIiwgIklP\
+UyJdCiAgICAtIG5hbWU6IGdvb2dsZWtleQogICAgICB0aXRsZTogWW91ciBHb29nbGUgS2V5IGZv\
+ciBGaXJlYmFzZSBDbG91ZCBNZXNzYWdpbmcKICAgICAgdHlwZTogc3RyaW5nCiAgICAgIGRpc3Bs\
+YXlfZ3JvdXA6IEFuZHJvaWQKICAgIC0gbmFtZTogcHJvamVjdE51bWJlcgogICAgICB0aXRsZTog\
+WW91ciBGQ00gUHJvamVjdCBOdW1iZXIsIG5lZWRlZCBvbiB0aGUgbW9iaWxlIGNsaWVudCBmb3Ig\
+Y29ubmVjdGluZyB3aXRoIEZDTQogICAgICB0eXBlOiBzdHJpbmcKICAgICAgZGlzcGxheV9ncm91\
+cDogQW5kcm9pZAogICAgLSBuYW1lOiBjZXJ0CiAgICAgIHRpdGxlOiBpT1MgLnAxMiBmaWxlIChl\
+bmNvZGUgY29udGVudHMgaW4gYmFzZTY0IGJlZm9yZSBwYXN0aW5nKQogICAgICB0eXBlOiBzdHJp\
+bmcKICAgICAgZGlzcGxheV90eXBlOiB0ZXh0YXJlYQogICAgICBkaXNwbGF5X2dyb3VwOiBpT1MK\
+ICAgIC0gbmFtZTogcGFzc3BocmFzZQogICAgICB0aXRsZTogVGhlIHBhc3NwaHJhc2UKICAgICAg\
+dHlwZTogc3RyaW5nCiAgICAgIGRpc3BsYXlfdHlwZTogcGFzc3dvcmQKICAgICAgZGlzcGxheV9n\
+cm91cDogaU9TCiAgICAtIG5hbWU6IGlvc0lzUHJvZHVjdGlvbgogICAgICB0aXRsZTogSXMgdGhp\
+cyBhIHByb2R1Y3Rpb24gY2VydGlmaWNhdGU/CiAgICAgIGRlZmF1bHQ6IGZhbHNlCiAgICAgIHR5\
+cGU6IGJvb2xlYW4KICAgICAgZGlzcGxheV90eXBlOiBjaGVja2JveAogICAgICBkaXNwbGF5X2dy\
+b3VwOiBpT1MK"
 
 COPY playbooks /opt/apb/actions
 COPY roles /opt/ansible/roles

apb.yml

@@ -25,7 +25,19 @@ plans:
     metadata:
       mobileclient_bind_parameters_data:
         - '{"name": "CLIENT_ID", "value": "metadata.name", "type": "path"}'
-    parameters: []
+    parameters: 
+    - name: SHARED_UPS
+      required: False
+      type: bool
+      title: Connect to an existing UPS 
+    - name: SHARED_HOST
+      required: False
+      type: string
+      title: URL of the shared UPS service
+    - name: SHARED_HOST_TOKEN
+      required: False
+      type: string
+      title: Auth token for the shared UPS service - Leave blank if not using shared UPS
     bind_parameters:
     - name: CLIENT_ID
       required: True

roles/provision-unifiedpush-apb/tasks/provision-ups.yml

@@ -107,6 +107,16 @@
     spec_tls_termination: edge
   register: ups_route
 
+- set_fact:
+    ups_route: "{{ ups_route.route.spec.host }}"
+
+- set_fact:
+    ups_route: "{{ SHARED_HOST }}"
+  when: SHARED_UPS | bool 
+
+- set_fact:
+    auth_token: "{{ SHARED_HOST_TOKEN | default(' ') }}"
+
 # We need to wait for the deployment to be ready before we can exit the ansible job
 - name: "Wait for all UPS containers to become ready"
   shell: oc get pods --namespace={{ namespace }} --selector="deploymentconfig={{ ups_deploymentconfig_name }}" -o jsonpath='{.items[*].status.containerStatuses[?(@.ready==true)].ready}'| wc -w

roles/provision-unifiedpush-apb/templates/secret-testing.yml.j2

@@ -10,5 +10,6 @@ metadata:
 stringData:
   type: "{{ ups_secret_name }}"
   name: "{{ ups_secret_name }}"
-  uri: "{{ ups_protocol}}://{{ ups_route.route.spec.host }}"
+  uri: "{{ ups_protocol}}://{{ ups_route }}"
+  ups_auth_token: "{{ auth_token }}"
   applicationId: "{{ namespace_push_app.json.pushApplicationID }}"

roles/provision-unifiedpush-apb/templates/secret.yml.j2

@@ -11,5 +11,6 @@ metadata:
 stringData:
   type: "{{ ups_secret_name }}"
   name: "{{ ups_secret_name }}"
-  uri: "{{ ups_protocol}}://{{ ups_route.route.spec.host }}"
+  uri: "{{ ups_protocol}}://{{ ups_route }}"
+  ups_auth_token: "{{ auth_token }}"
   applicationId: "{{ namespace_push_app.json.pushApplicationID }}"