Bug 1306411 - Funsize should accept new aus4-admin cert r=bhearsum
authorRail Aliiev <rail@mozilla.com>
Thu, 29 Sep 2016 14:32:58 -0400
changeset 4395 2525ca04b70bf096a83dfe5fc1e4f10c15f6d7f6
parent 4393 d9f51c2400dca238d29cb48a7a0c432c8bc91d66
child 4401 812a8622938d9e708817b45aa8802d93aab35786
child 4507 dc83939e53ba4493159a4591c58cd70e6874c8ab
push id2485
push userbmo:rail@mozilla.com
push dateThu, 29 Sep 2016 18:33:30 +0000
reviewersbhearsum
bugs1306411
Bug 1306411 - Funsize should accept new aus4-admin cert r=bhearsum MozReview-Commit-ID: LMBJyv3w9fD
modules/funsize_scheduler/manifests/init.pp
modules/funsize_scheduler/templates/config.yml.erb
--- a/modules/funsize_scheduler/manifests/init.pp
+++ b/modules/funsize_scheduler/manifests/init.pp
@@ -22,17 +22,17 @@ class funsize_scheduler {
                 "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",
                 "ecdsa==0.10",
                 "enum34==1.0.4",
-                "funsize==0.57",
+                "funsize==0.58",
                 "Jinja2==2.7.1",
                 "kombu==3.0.26",
                 "MarkupSafe==0.23",
                 "more_itertools==2.2",
                 "PGPy==0.3.0",
                 "PyHawk-with-a-single-extra-commit==0.1.5",
                 "PyYAML==3.10",
                 "pycparser==2.13",
--- a/modules/funsize_scheduler/templates/config.yml.erb
+++ b/modules/funsize_scheduler/templates/config.yml.erb
@@ -1,14 +1,14 @@
 ---
 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"
+    cert: "<%= scope.lookupvar("config::funsize_scheduler_root") %>/lib/python2.7/site-packages/funsize/data/ca-bundle.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") %>"