removing vars from role

playbooks/openshift-apps/resultsdb-ci-listener.yml

@@ -8,7 +8,6 @@
     - /srv/web/infra/ansible/vars/global.yml
     - /srv/private/ansible/vars.yml
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-    - /srv/web/infra/ansible/roles/openshift-apps/resultsdb-ci-listener/vars/{{ env }}.yml
 
   roles:
     - role: rabbit/user

roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml

@@ -12,7 +12,6 @@ data:
 
     amqp_url = "amqps://resultsdb{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
 
-
 {% if env == "staging" %}
     topic_prefix = "org.fedoraproject.stg"
 {% else %}
@@ -125,7 +124,7 @@ data:
     [sender]
     sender_type = ResultsdbSender
 {% if env == "staging" %}
-    resultsdb_url = {{ stg_results_ci_listener_resultsdb_url }}
+    resultsdb_url = https://resultsdb.stg.fedoraproject.org
 {% else %}
-    resultsdb_url = {{ prod_results_ci_listener_resultsdb_url }}
+    resultsdb_url = https://resultsdb.fedoraproject.org
 {% endif %}

roles/openshift-apps/resultsdb-ci-listener/templates/deploymentconfigs.yml

@@ -17,11 +17,7 @@ spec:
     spec:
       containers:
         - name: listener
-{% if env == 'staging' %}
+          image: quay.io/fedora/resultsdb-listener:latest
-          image: "{{ stg_resultsdb_ci_listener_image }}"
-{% else %}
-          image: "{{ prod_resultsdb_ci_listener_image }}"
-{% endif %}
           imagePullPolicy: Always
           ports:
             - containerPort: 5001

roles/openshift-apps/resultsdb-ci-listener/vars/prod.yml

@@ -1,2 +0,0 @@
-prod_results_ci_listener_resultsdb_url: "https://resultsdb.fedoraproject.org"
-prod_resultsdb_ci_listener_image: "quay.io/fedora/resultsdb-listener:latest"

roles/openshift-apps/resultsdb-ci-listener/vars/stg.yml

@@ -1,2 +0,0 @@
-stg_results_ci_listener_resultsdb_url: "https://resultsdb.stg.fedoraproject.org"
-stg_resultsdb_ci_listener_image: "quay.io/fedora/resultsdb-listener:latest"