solr: use a route instead of joining pod networks

playbooks/openshift-apps/solr.yml

@@ -35,21 +35,23 @@
     file: service.yml
     objectname: service.yml
 
+  - role: openshift/route
+    app: solr
+    routename: solr
+    host: "solr{{ env_suffix }}.fedoraproject.org"
+    serviceport: 8983-tcp
+    servicename: solr
+    annotations:
+      haproxy.router.openshift.io/ip_whitelist: 10.0.0.0/8
+
   - role: openshift/object
     app: solr
     template: deploymentconfig.yml
     objectname: deploymentconfig.yml
 
-- name: Link solr and fedora-packages-static networks
+# to run: sudo rbac-playbook -l staging -t delete openshift-apps/solr.yml
-  hosts: os_masters_stg[0]
+  - role: openshift/object-delete
-  user: root
+    app: solr
-  gather_facts: False
+    objecttype: project
-
+    objectname: solr
-  vars_files:
+    tags: [ never, delete ]
-    - /srv/web/infra/ansible/vars/global.yml
-    - "/srv/private/ansible/vars.yml"
-    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  tasks:
-  - name: Run oc adm command to link solr to other projects
-    command: "oc adm pod-network join-projects --to=solr fedora-packages-static"

roles/openshift-apps/fedora-packages-static/templates/configmap.yml

@@ -6,5 +6,5 @@ metadata:
   labels:
     app: fedora-packages-static
 data:
-  solr-url: "http://solr.solr.svc.cluster.local:8983/"
+  solr-url: "https://solr{{ env_suffix }}.fedoraproject.org:8983/"
   sitemap-url: "https://packages{{ env_suffix }}.fedoraproject.org"

roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml

@@ -22,7 +22,7 @@ spec:
       initContainers:
       - name: init-solr
         image: busybox
-        command: ['sh', '-c', 'until nslookup solr.solr.svc.cluster.local; do echo waiting for solr; sleep 2; done;']
+        command: ['sh', '-c', 'until ping -c1 solr{{ env_suffix }}.fedoraproject.org >/dev/null 2>&1; do echo waiting for solr; sleep 2; done']
       containers:
       - name: fedora-packages-static
         image: fedora-packages-static:latest