gistfile.diff

 manifests/moco-config.pp                           | 2 ++
 modules/config/manifests/base.pp                   | 2 ++
 modules/funsize_scheduler/manifests/init.pp        | 3 ++-
 modules/funsize_scheduler/templates/config.yml.erb | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/moco-config.pp b/manifests/moco-config.pp
index a89b083..132ee31 100644
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -325,9 +325,11 @@ class config inherits config::base {
 
     # Funsize Scheduler configuration
     $funsize_scheduler_root = "/builds/funsize"
     $funsize_scheduler_balrog_username = "funsize"
     $funsize_scheduler_pulse_username = "funsize"
     $funsize_scheduler_pulse_queue = "scheduler"
     $funsize_scheduler_pulse_exchange = "exchange/build"
     $funsize_scheduler_s3_bucket = "mozilla-nightly-updates"
+    $funsize_scheduler_balrog_worker_api_root = "http://balrog/api"
+    $funsize_scheduler_th_api_root = "https://treeherder.mozilla.org/api"
 }
diff --git a/modules/config/manifests/base.pp b/modules/config/manifests/base.pp
index e850651..80d31f7 100644
--- a/modules/config/manifests/base.pp
+++ b/modules/config/manifests/base.pp
@@ -392,9 +392,11 @@ class config::base {
 
     # Funsize Scheduler configuration
     $funsize_scheduler_root = "/builds/funsize"
     $funsize_scheduler_balrog_username = ""
     $funsize_scheduler_pulse_username = ""
     $funsize_scheduler_pulse_queue = ""
     $funsize_scheduler_pulse_exchange = ""
     $funsize_scheduler_s3_bucket = ""
+    $funsize_scheduler_balrog_worker_api_root = ""
+    $funsize_scheduler_th_api_root = ""
 }
diff --git a/modules/funsize_scheduler/manifests/init.pp b/modules/funsize_scheduler/manifests/init.pp
index d84011a..31a5f2b 100644
--- a/modules/funsize_scheduler/manifests/init.pp
+++ b/modules/funsize_scheduler/manifests/init.pp
@@ -21,24 +21,25 @@ class funsize_scheduler {
             packages => [
                 "amqp==1.4.6",
                 "anyjson==0.3.3",
                 "argparse==1.2.1",
                 "cffi==1.1.0",
                 # PGPy depends on this _specific_ version of cryptography
                 "cryptography==0.6",
                 "enum34==1.0.4",
-                "funsize==0.8",
+                "funsize==0.9",
                 "Jinja2==2.7.1",
                 "kombu==3.0.26",
                 "MarkupSafe==0.23",
                 "PGPy==0.3.0",
                 "pycparser==2.13",
                 "PyHawk-with-a-single-extra-commit==0.1.5",
                 "PyYAML==3.10",
+                "redo=1.4.1",
                 # Taskcluster pins requests 2.4.3, so we need to de the same,
                 # even though we'd rather use a more up-to-date version.
                 "requests==2.4.3",
                 "singledispatch==3.4.0.3",
                 "six==1.9.0",
                 "taskcluster==0.0.16",
                 "wsgiref==0.1.2",
            ];
diff --git a/modules/funsize_scheduler/templates/config.yml.erb b/modules/funsize_scheduler/templates/config.yml.erb
index b66a6e2..baccb5a 100644
--- a/modules/funsize_scheduler/templates/config.yml.erb
+++ b/modules/funsize_scheduler/templates/config.yml.erb
@@ -1,21 +1,23 @@
 ---
 balrog:
     username: "<%= scope.lookupvar("config::funsize_scheduler_balrog_username") %>"
     password: "<%= scope.function_secret(["funsize_scheduler_balrog_password"]) %>"
     api_root: "https://aus4-admin.mozilla.org/api"
     cert: "<%= scope.lookupvar("config::funsize_scheduler_root") %>/lib/python2.7/site-packages/funsize/data/mozilla-root.crt"
+    worker_api_root: "<%= scope.lookupvar("config::funsize_scheduler_balrog_worker_api_root") %>"
 
 pulse:
     user: "<%= scope.lookupvar("config::funsize_scheduler_pulse_username") %>"
     password: "<%= scope.function_secret(["funsize_scheduler_pulse_password"]) %>"
     queue: "<%= scope.lookupvar("config::funsize_scheduler_pulse_queue") %>"
     exchange: "<%= scope.lookupvar("config::funsize_scheduler_pulse_exchange") %>"
 
 taskcluster:
     credentials:
       clientId: "<%= scope.function_secret(["funsize_scheduler_taskcluster_client_id"]) %>"
       accessToken: "<%= scope.function_secret(["funsize_scheduler_taskcluster_access_token"]) %>"
 s3:
     bucket: "<%= scope.lookupvar("config::funsize_scheduler_s3_bucket") %>"
     aws_access_key_id: "<%= scope.function_secret(["funsize_scheduler_aws_access_key_id"]) %>"
     aws_secret_access_key: "<%= scope.function_secret(["funsize_scheduler_aws_secret_access_key"]) %>"
+th_api_root: "<%= scope.lookupvar("config::funsize_scheduler_th_api_root") %>"