Merge branch 'fog'

Change-Id: I22026c17fd94e7a1bb22c0fb87035c4f9bff12ff
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --cc Dockerfile
index 10efe45,10efe45..ebbd0ac
--- 1/Dockerfile
--- 2/Dockerfile
+++ b/Dockerfile
@@@ -33,6 -33,6 +33,7 @@@ RUN  apt-get update && 
    DEBIAN_FRONTEND=noninteractive apt-get update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
    DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \
++  DEBIAN_FRONTEND=noninteractive pip install -U fog05rest && \
    DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
    DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \
    DEBIAN_FRONTEND=noninteractive pip install untangle && \

diff --cc docker/Dockerfile-local
index 9897c4d,ec9a0ed..1bd50a4
--- 1/docker/Dockerfile-local
--- 2/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@@ -10,6 -10,6 +10,8 @@@ RUN apt-get update && 
      DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \
      DEBIAN_FRONTEND=noninteractive pip2 install pip==9.0.3 && \
      DEBIAN_FRONTEND=noninteractive pip2 install -U progressbar pyvmomi pyvcloud==19.1.1 && \
++    DEBIAN_FRONTEND=noninteractive pip2 install -U fog05rest && \
++    DEBIAN_FRONTEND=noninteractive apt-get -y install python-requests && \
      DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
      DEBIAN_FRONTEND=noninteractive apt-get -y install python-cffi libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
      DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \

diff --cc osm_ro/vim_thread.py
Simple merge

diff --cc scripts/install-openmano.sh
index bbf33e4,bbf33e4..a34a0aa
--- 1/scripts/install-openmano.sh
--- 2/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@@ -262,6 -262,6 +262,9 @@@ the
      [ "$_DISTRO" == "Ubuntu" ] && install_packages "genisoimage"
      [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "genisoimage"
  
++    # required for fog connector
++    pip2 install fog05rest || exit 1
++
      # required for OpenNebula connector
      pip2 install untangle || exit 1
      pip2 install -e git+https://github.com/python-oca/python-oca#egg=oca || exit 1