Merge pull request #898 from grycap/devel

Devel

changelog

@@ -520,3 +520,20 @@ IM 1.8.4:
 IM 1.8.5:
     * Enable CIDR selection in network creation in OpenStack conn.
     * Fix error infrastructure not correctly deleted if destroy is sent in initial stage.
+    * Fix error procesing TOSCA document if a policy does not have properties field.
+    * Fix error listing Routers in OpenStack conn.
+    * Fix error deleting FW in GCE conn.
+    * Fix error in OpenNebula conn in case API endpoint is behind a reverse proxy.
+    * Fix error deleting infra in case of Opennebula 4.8 trying to delete security groups.
+    * Add requirements in FogBow conn.
+    * Enable to specify the cluster to deploy the VM on OpenNebula conn.
+    * Support for adding block storage and networks to running VMs with OpenStack.
+    * Fix problems using tokens with OpenStack.
+    * Fix error in ctxt process testing ssh connection.
+    * Fix error parsing TOSCA in case of implemetation is a dict.
+    * Enable to filter the list of infrastructures.
+    * Optional tenant name for OpenStack using VOMS authentication.
+    * Fix SSH reverse tunnels does not work in IM service with HTTPS.
+    * Enable to specify GPU and SGX in Fogbow conn.
+    * Improve TOSCA network management to create L2 nets.
+    * Fix error attaching a new disk in OCCI conn.

docker/Dockerfile

@@ -15,7 +15,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y gcc git python
      pip install pip --upgrade -I && \
      /usr/local/bin/pip install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-storage && \
      /usr/local/bin/pip install MySQL-python pycrypto cheroot xmltodict pymongo && \
-     cd /tmp && git clone https://github.com/micafer/libcloud --branch=im && /usr/local/bin/pip install /tmp/libcloud && \
      /usr/local/bin/pip install IM==1.8.5 && \
      /usr/local/bin/pip uninstall pip -y && \
      apt-get purge -y gcc git python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \

setup.py

@@ -67,6 +67,6 @@
       description="IM is a tool to manage virtual infrastructures on Cloud deployments",
       platforms=["any"],
       install_requires=["ansible >= 2.0", "paramiko >= 1.14", "PyYAML", suds_pkg, sqlite_pkg, "cheroot",
-                        "boto >= 2.29", "apache-libcloud >= 2.4.0", "RADL >= 1.1.2", "bottle", "netaddr",
+                        "boto >= 2.29", "apache-libcloud >= 2.6.0", "RADL >= 1.1.2", "bottle", "netaddr",
                         "requests >= 2.19", "scp", "tosca-parser", 'defusedxml', 'urllib3>=1.23']
       )