Make it so our http configs for repoSpanner do not wander off from each other due to too many cooks and too few pots. Change all repospanner related 8443 to use jinja variable repoSpanner_{{region}}_http

inventory/group_vars/pagure

@@ -8,7 +8,7 @@ num_cpus: 12
 # the host_vars/$hostname file
 
 tcp_ports: [ 22, 25, 80, 443, 9418,
-    8442, 8443,
+    8442, 8443, 8444, 8445
     # Used for the eventsource
     8088,
     # This is for the pagure public fedmsg relay

inventory/group_vars/pkgs-stg

@@ -3,7 +3,7 @@ lvm_size: 100000
 mem_size: 16384
 num_cpus: 4
 
-tcp_ports: [ 80, 443, 8444, 8443 ]
+tcp_ports: [ 80, 443, 8444, 8443, 8445 ]
 # Definining these vars has a number of effects
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg

playbooks/groups/pkgs.yml

@@ -23,13 +23,13 @@
       node: fedora01,
       region: rpms,
       rpc_port: 8444,
-      http_port: 8445,
+      http_port: 8443,
       spawn_repospanner_node: true,
       when: env == "staging" }
   - { role: repospanner/bridge,
       zone: rpms,
       zonecert: fedora_rpms_push,
-      baseurl: "fedora01.rpms.stg.fedoraproject.org:8445",
+      baseurl: "fedora01.rpms.stg.fedoraproject.org:8443",
       when: env == "staging" }
   - gitolite/base
   - cgit/base

playbooks/groups/repospanner.yml

@@ -29,7 +29,7 @@
       region: ansible,
       spawn_repospanner_node: true,
       rpc_port: 8442,
-      http_port: 8443,
+      http_port: {{ repoSpanner_ansible_http }},
       when: inventory_hostname == 'repospanner01.phx2.fedoraproject.org'
     }
 #  - { role: repospanner/server,
@@ -38,7 +38,7 @@
 #      spawn_repospanner_node: false,
 #      join_repospanner_node: repospanner01.ansible.fedoraproject.org,
 #      rpc_port: 8442,
-#      http_port: 8443,
+#      http_port: {{ repoSpanner_ansible_http }},
 #      when: inventory_hostname == 'repospanner-cc-rdu01.fedoraproject.org'
 #    }
 #  - { role: repospanner/server,
@@ -47,7 +47,7 @@
 #      spawn_repospanner_node: false,
 #      join_repospanner_node: repospanner01.ansible.fedoraproject.org,
 #      rpc_port: 8442,
-#      http_port: 8443,
+#      http_port: {{ repoSpanner_ansible_http }},
 #      when: inventory_hostname == 'repospanner-osuosl01.fedoraproject.org'
 #    }
 
@@ -59,7 +59,7 @@
       region: rpms,
       spawn_repospanner_node: true,
       rpc_port: 8444,
-      http_port: 8445,
+      http_port: {{ repoSpanner_rpms_http }},
       when: inventory_hostname == 'repospanner-cc-rdu01.fedoraproject.org'
     }
   - { role: repospanner/server,
@@ -68,7 +68,7 @@
       spawn_repospanner_node: false,
       join_repospanner_node: fedora01.rpms.fedoraproject.org,
       rpc_port: 8444,
-      http_port: 8445,
+      http_port: {{ repoSpanner_rpms_http }},
       when: inventory_hostname == 'repospanner-osuosl01.fedoraproject.org'
     }
   - { role: repospanner/server,
@@ -77,7 +77,7 @@
       spawn_repospanner_node: false,
       join_repospanner_node: centos01.rpms.fedoraproject.org,
       rpc_port: 8444,
-      http_port: 8445,
+      http_port: {{ repoSpanner_rpms_http }},
       when: inventory_hostname == 'repospanner01.phx2.fedoraproject.org'
     }
 

roles/distgit/pagure/templates/pagure_shared.cfg

@@ -116,7 +116,7 @@ REPOSPANNER_NEW_REPO_ADMIN_OVERRIDE = True
 REPOSPANNER_NEW_FORK = True
 REPOSPANNER_ADMIN_MIGRATION = True
 REPOSPANNER_REGIONS = {
-    'rpms': {'url': 'https://fedora01.rpms.stg.fedoraproject.org:8443',
+    'rpms': {'url': 'https://fedora01.rpms.stg.fedoraproject.org:{{ repoSpanner_ansible_http }}',
              'repo_prefix': 'pagure/',
 {% if env == "staging" %}
 	     'hook': '06cd5acb2d774491e02bc0dd4dc1555ab5664a6a',

roles/pagure/frontend/templates/pagure.cfg

@@ -348,7 +348,7 @@ REPOSPANNER_NEW_REPO_ADMIN_OVERRIDE = False
 REPOSPANNER_NEW_FORK = None
 REPOSPANNER_ADMIN_MIGRATION = False
 REPOSPANNER_REGIONS = {
-    "ansible": {"url": "https://pagure01.ansible.fedoraproject.org:8443",
+    "ansible": {"url": "https://pagure01.ansible.fedoraproject.org:{{ repoSpanner_ansible_http }}",
                 "repo_prefix": "",
                 "hook": None,
                 "ca": "/etc/pagure/repospanner/ca.crt",

roles/pagure/frontend/templates/repobridge_ansible.json

@@ -1,6 +1,6 @@
 {
     "ca": "/etc/pagure/repospanner/ca.crt",
-    "baseurl": "https://pagure01.ansible.fedoraproject.org:8443",
+    "baseurl": "https://pagure01.ansible.fedoraproject.org:{{ repoSpanner_ansible_http }}",
     "certs": {
         "_default_": {
             "cert": "/etc/pagure/repospanner/ansible-push.crt",

vars/global.yml

@@ -65,3 +65,6 @@ global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients',
                    'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh',
                    'libselinux-python', 'ntpdate', 'bash-completion', 'telnet',
                    'atop', 'htop', 'rsyslog' ]
+# Set up variables for various files to make sure we don't forget to use.
+repoSpanner_rpms_http: 8445
+repoSpanner_ansible_http: 8443