Hubs: move the stg variables to the group vars

inventory/group_vars/hubs-stg

@@ -25,3 +25,9 @@ fedmsg_certs:
   - hubs.hub.created
   - hubs.hub.updated
   - hubs.widget.updated
+
+# Used by the hubs role
+hubs_url_hostname: hubs.stg.fedoraproject.org
+hubs_db_host: db01.stg.phx2.fedoraproject.org
+hubs_oidc_url: id.stg.fedoraproject.org
+hubs_oidc_secret: "{{ hubs_stg_oidc_secret }}"

playbooks/groups/hubs.yml

@@ -89,10 +89,8 @@
   - fedmsg/base
   - role: hubs
     main_user: hubs
-    hubs_url_hostname: hubs.stg.fedoraproject.org
     hubs_secret_key: "{{ hubs_session_secret }}"
     hubs_db_type: postgresql
-    hubs_db_host: db01.stg.phx2.fedoraproject.org
     hubs_db_user: hubsapp
     hubs_db_password: "{{ hubs_db_pass }}"
     hubs_dev_mode: false
@@ -103,7 +101,6 @@
     hubs_ssl_key: null
     hubs_fas_username: "{{ fedoraDummyUser }}"
     hubs_fas_password: "{{ fedoraDummyUserPassword }}"
-    hubs_oidc_url: id.stg.fedoraproject.org
 
   tasks:
   - name: add more hubs workers

roles/hubs/defaults/main.yml

@@ -18,3 +18,4 @@ hubs_ssl_key: /etc/pki/tls/private/{{ hubs_url_hostname }}.key
 hubs_fas_username: null
 hubs_fas_password: null
 hubs_oidc_url: iddev.fedorainfracloud.org
+hubs_oidc_secret: changeme

roles/hubs/templates/oidc_client_secrets.json

@@ -3,7 +3,7 @@
         "client_id": "hubs",
         "auth_uri": "https://{{ hubs_oidc_url }}/openidc/Authorization",
         "issuer": "https://{{ hubs_oidc_url }}/openidc/",
-        "client_secret": "{{ hubs_stg_oidc_secret }}",
+        "client_secret": "{{ hubs_oidc_secret }}",
         "token_uri": "https://{{ hubs_oidc_url }}/openidc/Token",
         "userinfo_uri": "https://{{ hubs_oidc_url }}/openidc/UserInfo",
         "redirect_uris": [