Move the qa-landingpage reverse proxy config removal

...we already have a better place to do this, it turns out.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

playbooks/include/proxies-certificates.yml

@@ -76,15 +76,6 @@
     tags:
     - getfedora.org
 
-  - role: httpd/certificate
-    certname: qa.stg.fedoraproject.org
-    SSLCertificateChainFile: qa.stg.fedoraproject.org.intermediate.cert
-    when: env == "staging"
-
-  - role: httpd/certificate
-    certname: qa.fedoraproject.org
-    SSLCertificateChainFile: qa.fedoraproject.org.intermediate.cert
-
   # - role: httpd/certificate
   #   certname: secondary.koji.fedoraproject.org.letsencrypt
   #   SSLCertificateChainFile: secondary.koji.fedoraproject.org.letsencrypt.intermediate.crt

playbooks/include/proxies-redirects.yml

@@ -396,11 +396,12 @@
     target: http://fedoraplanet.org/
 
   # QA
-  #  - role: httpd/redirect
-  #  shortname: qa
-  #  website: qa.fedoraproject.org
-  #  target: https://fedoraproject.org/wiki/QA
-  #  when: env != 'staging'
+  - role: httpd/redirect
+    shortname: qa
+    website: qa.fedoraproject.org
+    target: https://{{env_prefix}}fedoraproject.org/wiki/QA
+    tags:
+    - qa
 
   # Various community sites
   - role: httpd/redirectmatch

playbooks/include/proxies-reverseproxy.yml

@@ -22,6 +22,7 @@
     with_items:
     - meetbot.fedoraproject.org/reversepassproxy.conf
     - meetbot.fedoraproject.org/meetbot.conf
+    - qa.fedoraproject.org/qa-landingpage.conf
     notify:
     - Reload proxyhttpd
     tags:
@@ -299,31 +300,6 @@
     remotepath: /blockerbugs
     localpath: /blockerbugs
     tags: blockerbugs
-    when: env == "staging"
-
-  - role: httpd/reverseproxy
-    website: qa.fedoraproject.org
-    destname: qa-landingpage
-    balancer_name: apps-ocp
-    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
-    targettype: openshift
-    keephost: true
-    ocp4: true
-    tags: qa-landingpage
-
-  - role: httpd/reverseproxy
-    website: qa.fedoraproject.org
-    destname: blockerbugs
-    balancer_name: apps-ocp
-    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
-    targettype: openshift
-    keephost: true
-    ocp4: true
-    remotepath: /blockerbugs
-    localpath: /blockerbugs
-    tags: blockerbugs
-    when: env != "staging"
-
 
   - role: httpd/reverseproxy
     website: fedoraproject.org

playbooks/openshift-apps/blockerbugs.yml

@@ -130,15 +130,6 @@
     route_serviceport: 8080-tcp
     route_servicename: blockerbugs
 
-  - role: openshift/route
-    route_app: blockerbugs
-    route_name: qa-landing
-    route_host: "qa{{ env_suffix }}.fedoraproject.org"
-    route_serviceport: 8080-tcp
-    route_servicename: qa-landing
-    route_annotations:
-      haproxy.router.openshift.io/set-forwarded-headers: append
-
   - role: openshift/start-build
     start_build_app: blockerbugs
     start_build_buildname: blockerbugs-build

roles/openshift-apps/blockerbugs/files/service.yml

@@ -14,19 +14,3 @@ spec:
   selector:
     app: blockerbugs
     service: blockerbugsN
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: blockerbugs
-  name: qa-landing
-spec:
-  ports:
-  - name: 8080-tcp
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: blockerbugs
-    service: qa-landingN

roles/openshift-apps/blockerbugs/templates/buildconfig.yml.j2

@@ -28,36 +28,3 @@ spec:
   triggers:
   - type: ConfigChange
   - type: ImageChange
----
-apiVersion: build.openshift.io/v1
-kind: BuildConfig
-metadata:
-  name: qa-landing-page-build
-  labels:
-    environment: "blockerbugs"
-spec:
-  output:
-    to:
-      kind: ImageStreamTag
-      name: qa-landing:latest
-  source:
-    type: Git
-    git:
-      uri: 'https://pagure.io/fedora-qa/landingpage.git'
-{% if env == 'staging' %}
-      ref: 'master'
-{% else %}
-      ref: 'master'
-{% endif %}
-  strategy:
-    type: Docker
-    dockerStrategy:
-      dockerfilePath: Dockerfile
-      env:
-      - name: "SUBDIR"
-        value: "/"
-      - name: "API"
-        value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/"
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange

roles/openshift-apps/blockerbugs/templates/deployment.yml.j2

@@ -118,35 +118,3 @@ spec:
       - name: blockerbugs-secret-volume
         secret:
           secretName: blockerbugs-secret
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: blockerbugs
-    service: qa-landingN
-  name: qa-landing
-  annotations:
-    image.openshift.io/triggers: >-
-      [{"from":{"kind":"ImageStreamTag","name":"qa-landing:latest","namespace":"blockerbugs"},"fieldPath":"spec.template.spec.containers[?(@.name==\"qa-landing\")].image","pause":"false"}]
-spec:
-  replicas: 1 # Never change this to more or less than ONE!
-  selector:
-    matchLabels:
-      app: blockerbugs
-      service: qa-landingN
-  template:
-    metadata:
-      labels:
-        app: blockerbugs
-        service: qa-landingN
-    spec:
-      containers:
-      - name: qa-landing
-        image: image-registry.openshift-image-registry.svc:5000/blockerbugs/qa-landing:latest
-        resources: {}
-        env:
-        - name: SUBDIR
-          value: "/"
-        - name: API
-          value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/"

roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml.j2

@@ -138,41 +138,3 @@ spec:
       from:
         kind: ImageStreamTag
         name: blockerbugs:latest
----
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
-metadata:
-  labels:
-    app: blockerbugs
-    service: qa-landing
-  name: qa-landing
-spec:
-  replicas: 0 # Never change this to more or less than ONE!
-  selector:
-    app: blockerbugs
-    deploymentconfig: blockerbugs
-  template:
-    metadata:
-      labels:
-        app: blockerbugs
-        deploymentconfig: blockerbugs
-    spec:
-      containers:
-      - name: qa-landing
-        image: qa-landing:latest
-        resources: {}
-        env:
-        - name: SUBDIR
-          value: "/"
-        - name: API
-          value: "https://packager-dashboard{{ env_suffix }}.fedoraproject.org/api/v1/"
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      containerNames:
-      - qa-landing
-      from:
-        kind: ImageStreamTag
-        name: qa-landing:latest

roles/openshift-apps/blockerbugs/templates/imagestream.yml.j2

@@ -8,18 +8,3 @@ spec:
     local: false
 status:
   dockerImageRepository: ""
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: qa-landing
-spec:
-  lookupPolicy:
-    local: false
-  tags:
-  - name: latest
-    from:
-      kind: ImageStreamTag
-      name: qa-landing
-status:
-  dockerImageRepository: ""

roles/pagure/templates/pagure.cfg

@@ -40,8 +40,13 @@ DB_URL = 'postgresql://{{ pagure_db_user }}:{{ pagure_db_pass }}@{{ pagure_db_ho
 {% endif %}
 
 ### The FAS group in which the admin of pagure are
+{% if env == 'pagure-staging' %}
+ADMIN_GROUP = None
+PAGURE_ADMIN_USERS = ["pingou", "kevin", "mobrien", "nb", "zlopez", "ryanlerch", "amedvede"]
+{% else %}
 ADMIN_GROUP = None
 PAGURE_ADMIN_USERS = ["pingou", "kevin", "nb", "zlopez", "ryanlerch"]
+{% endif %}
 
 # The publicly visible admin email address
 ADMIN_EMAIL = 'admin@fedoraproject.org'