Merge pull request #1376 from edx/feanil/monitor_update

Feanil/monitor update

playbooks/roles/jenkins_admin/files/nat-monitor.sh

@@ -56,7 +56,7 @@ while [ . ]; do
   # Re check thi IDs and IPs periodically
   # This is useful in case the primary nat changes by some
   # other means than this script.
-  if [ $COUNTER -eq 0 ]
+  if [ $COUNTER -eq 0 ]; then
     # NAT instance variables
     PRIMARY_NAT_ID=`aws ec2 describe-route-tables --filters Name=tag:aws:cloudformation:stack-name,Values=$VPC_NAME Name=tag:aws:cloudformation:logical-id,Values=PrivateRouteTable | jq '.RouteTables[].Routes[].InstanceId|strings' -r`
     BACKUP_NAT_ID=`aws ec2 describe-instances --filters Name=tag:aws:cloudformation:stack-name,Values=$VPC_NAME Name=tag:aws:cloudformation:logical-id,Values=NATDevice,BackupNATDevice | jq '.Reservations[].Instances[].InstanceId' -r | grep -v $PRIMARY_NAT_ID`

playbooks/roles/jenkins_admin/tasks/main.yml

@@ -139,3 +139,5 @@
   with_items: jenkins_admin_gem_pkgs
 
 - include: nat_monitor.yml
+  tags:
+    - nat-monitor

playbooks/roles/supervisor/templates/etc/init/supervisor-upstart.conf.j2

@@ -8,4 +8,4 @@ start on runlevel [2345]
 stop on runlevel [!2345]
 
 setuid {{ supervisor_service_user }}
-exec {{ supervisor_venv_dir }}/bin/supervisord --nodaemon --configuration {{ supervisor_cfg }}
+exec {{ supervisor_venv_dir }}/bin/supervisord -n --configuration {{ supervisor_cfg }}