openscanhub: fix configurations for production

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>

playbooks/openshift-apps/openscanhub.yml

@@ -52,12 +52,15 @@
     key: service.keytab
     secret_name: openscanhub-keytab
     service: HTTP
-    # https://pagure.io/fedora-infra/ansible/pull-request/1669#comment-195794
-    # We should get separate approval for "opencanhub.fedoraproject.org"
-    # Fix below line if correct route is not generated.
-    # https://pagure.io/fedora-infra/ansible/pull-request/1669#comment-195809
     host: "openscanhub.stg.fedoraproject.org"
     when: env == "staging"
+  - role: openshift/keytab
+    app: openscanhub
+    key: service.keytab
+    secret_name: openscanhub-keytab
+    service: HTTP
+    host: "openscanhub.fedoraproject.org"
+    when: env == "production"
   - role: openshift/object
     app: openscanhub
     file: openscanhub-deployment-fedora-osh-hub.yml
@@ -65,7 +68,7 @@
     when: env == "staging"
   - role: openshift/object
     app: openscanhub
-    file: openscanhub-route-fedora-osh-hub.yml
+    template: openscanhub-route-fedora-osh-hub.yml
     objectname: openscanhub-route-fedora-osh-hub
     when: env == "staging"
   - role: openshift/object

roles/openshift-apps/openscanhub/templates/openscanhub-route-fedora-osh-hub.yml

@@ -8,12 +8,12 @@ metadata:
     app.kubernetes.io/name: fedora-osh-hub
     app.kubernetes.io/part-of: openscanhub
   # TODO: This should be a template and use production for production instance.
-  name: staging
+  name: openscanhub{{ env_suffix }}-fedoraproject-org
   namespace: openscanhub
   resourceVersion: "2899601169"
   uid: 1c280b7f-39a4-40fc-a850-396147e1c1af
 spec:
-  host: openscanhub.stg.fedoraproject.org
+  host: openscanhub{{ env_suffix }}.fedoraproject.org
   port:
     targetPort: 8080-tcp
   tls: