Skip to content

Commit 0e65f1e

Browse files
committed
Fixed multiple aws key issue
1 parent b53117b commit 0e65f1e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

server/app/lib/utils/masterUtil.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2617,7 +2617,8 @@ var MasterUtil = function () {
26172617
});
26182618
};
26192619
this.getSensuCookbooks = function(){
2620-
var cookbooks = ['recipe[sensu-client]','recipe[sensu_check_load]','recipe[sensu_check_disk]','recipe[sensu_check_cpu]','recipe[sensu_check_memory]','recipe[consul-client-demo]'];
2620+
//var cookbooks = ['recipe[sensu-client]','recipe[sensu_check_load]','recipe[sensu_check_disk]','recipe[sensu_check_cpu]','recipe[sensu_check_memory]','recipe[consul-client-demo]'];
2621+
var cookbooks = ['recipe[sensu-client]','recipe[consul-client-demo]','recipe[cft-rlc-demo]'];
26212622
return cookbooks;
26222623
};
26232624

server/app/services/schedulerService.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,17 @@ function startStopManagedInstance(instance,catUser,action,callback){
716716
callback(err);
717717
return;
718718
}
719-
callback(null, keyPair[0].region);
719+
//Fix for additional regions added for provider - Vinod
720+
var foundRegion = false;
721+
for(var p = 0; p < keyPair.length; p++){
722+
if(keyPair[p].region == instance.region){
723+
foundRegion = true;
724+
callback(null, keyPair[p].region);
725+
726+
}
727+
}
728+
if(!foundRegion) //to support old flow.
729+
callback(null, keyPair[0].region);
720730
});
721731
}
722732
}

0 commit comments

Comments
 (0)