Bug 1462066 - pushsnap_scriptworker: add esr credentials r=mtabara
authorJohan Lorenzo <jlorenzo@mozilla.com>
Thu, 17 May 2018 16:40:33 +0200
changeset 6853 956aa85e238808fdcd53ca24a5d8a8f08c9acb8a
parent 6852 eb4544f7db1a736a162040f04f7332e395e517cb
child 6854 7c86459b3ce8d173a1fcad9eaa2cce782444d864
child 6897 c0fd19759f0fd55e0d9a520e6f6a0cbb80a7df08
push id2773
push userbmo:jlorenzo@mozilla.com
push dateThu, 17 May 2018 14:40:42 +0000
reviewersmtabara
bugs1462066
Bug 1462066 - pushsnap_scriptworker: add esr credentials r=mtabara MozReview-Commit-ID: KJf8rhvhKQp
modules/pushsnap_scriptworker/manifests/init.pp
modules/pushsnap_scriptworker/manifests/settings.pp
--- a/modules/pushsnap_scriptworker/manifests/init.pp
+++ b/modules/pushsnap_scriptworker/manifests/init.pp
@@ -83,15 +83,17 @@ class pushsnap_scriptworker {
             # No more files to add
         }
         'prod': {
             file {
                 $macaroons_config['beta']['target_location']:
                     content     => $macaroons_config['beta']['content'];
                 $macaroons_config['candidate']['target_location']:
                     content     => $macaroons_config['candidate']['content'];
+                $macaroons_config['esr']['target_location']:
+                    content     => $macaroons_config['esr']['content'];
             }
         }
         default: {
             fail("Invalid pushsnap_scriptworker_env given: ${pushsnap_scriptworker_env}")
         }
     }
 }
--- a/modules/pushsnap_scriptworker/manifests/settings.pp
+++ b/modules/pushsnap_scriptworker/manifests/settings.pp
@@ -48,21 +48,26 @@ class pushsnap_scriptworker::settings {
                 'beta'  => {
                     content         => $_snap_store_macaroons['beta'],
                     target_location => "${root}/beta_macaroon.cfg",
                 },
                 'candidate'  => {
                     content         => $_snap_store_macaroons['candidate'],
                     target_location => "${root}/candidate_macaroon.cfg",
                 },
+                'esr'  => {
+                    content         => $_snap_store_macaroons['esr'],
+                    target_location => "${root}/esr_macaroon.cfg",
+                },
             }
 
             $macaroons_locations = {
                 beta      => $macaroons_config['beta']['target_location'],
                 candidate => $macaroons_config['candidate']['target_location'],
+                esr       => $macaroons_config['esr']['target_location'],
             }
         }
         default: {
             fail("Invalid pushsnap_scriptworker_env given: ${pushsnap_scriptworker_env}")
         }
     }
 
     $script_config_content      = {