bodhi: Move OpenShift vars into the playbook so they are defined.

Apparently the bodhi2-stg vars file is not used by the OpenShift
playbook, so let's just put the vars into the playbook.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

inventory/group_vars/bodhi2-stg

@@ -22,13 +22,6 @@ openshift_pods: 1
 
 tcp_ports: [ 80 ]
 
-bodhi_message_queue_name: "bodhi{{ env_suffix }}"
-# Define the topics that our fedora-messaging queue should be subscribed to.
-bodhi_message_routing_keys:
-  - "org.fedoraproject.*.bodhi.update.edit"
-  - "org.fedoraproject.*.bodhi.update.request.testing"
-  - "org.fedoraproject.*.buildsys.tag"
-
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 

playbooks/openshift-apps/bodhi.yml

@@ -8,6 +8,13 @@
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  vars:
+    - bodhi_message_queue_name: "bodhi{{ env_suffix }}"
+    - bodhi_message_routing_keys:
+      - "org.fedoraproject.*.bodhi.update.edit"
+      - "org.fedoraproject.*.bodhi.update.request.testing"
+      - "org.fedoraproject.*.buildsys.tag"
+
   pre_tasks:
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README