From: hoban <adrian.hoban@intel.com>
Date: Tue, 12 Dec 2017 17:30:11 +0000 (+0100)
Subject: Merge "Minor Bug Fixes"
X-Git-Tag: v4.0.0~42
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5989ee87bec05f7f30c81d1a181aed90ba8666a8;hp=-c;p=osm%2FMON.git

Merge "Minor Bug Fixes"
---

5989ee87bec05f7f30c81d1a181aed90ba8666a8
diff --combined scripts/install_mon.sh
index bee28a0,8ad09c5..f78dd6a
--- a/scripts/install_mon.sh
+++ b/scripts/install_mon.sh
@@@ -1,6 -1,4 +1,4 @@@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
- 
+ #!/bin/sh
  # Copyright 2017 Intel Research and Development Ireland Limited
  # *************************************************************
  
@@@ -36,5 -34,5 +34,5 @@@ lxc exec MON -- apt-get --yes install g
  lxc exec MON -- git clone https://osm.etsi.org/gerrit/osm/MON.git
  lxc exec MON -- pip install -r /root/MON/requirements.txt
  lxc exec MON -- python /root/MON/kafkad
 -lxc exec MON -- . /root/MON/scripts/kafka.sh
 -lxc exec MON -- . /root/MON/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
 +lxc exec MON -- /bin/bash /root/MON/scripts/kafka.sh
 +lxc exec MON -- /bin/bash /root/MON/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh