Merge pull request #1036 from grycap/devel

Set version 1.9.3

IM/InfrastructureInfo.py

@@ -245,7 +245,7 @@ def destroy(self, auth, force=False):
         """
         Destroy the infrastructure
         """
-        InfrastructureInfo.logger.info("Destroying the Inf ID: " + str(self.id))
+        InfrastructureInfo.logger.info("Destroying the Inf ID: %s (force=%s)" % (self.id, force))
         try:
             # First stop ctxt processes
             self.stop()

IM/__init__.py

@@ -19,7 +19,7 @@
            'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry',
            'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPAdapter',
            'VirtualMachine', 'VMRC', 'xmlobject']
-__version__ = '1.9.2'
+__version__ = '1.9.3'
 __author__ = 'Miguel Caballer'
 
 

changelog

@@ -586,3 +586,8 @@ IM 1.9.2:
     * Fix error in get_nets_common_cird if cidr is not set.
     * Fix error creating VPC in case of common network do not uses /16 range.
     * Fir error adding routers in EC2 conn.
+
+IM 1.9.3:
+    * Support for ex_tenant_domain_id due to change in libcloud.
+    * Error getting EC2 instance types.
+    * Error deleting SGs in some OpenStack sites.

docker-devel/Dockerfile

@@ -1,8 +1,8 @@
 # Dockerfile to create a container with the IM service
 FROM grycap/jenkins:ubuntu16.04-im
 ARG BRANCH=devel
-MAINTAINER Miguel Caballer <[email protected]>
-LABEL version="1.9.2"
+LABEL maintainer="Miguel Caballer <[email protected]>"
+LABEL version="1.9.3"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 
 EXPOSE 8899 8800
@@ -14,7 +14,8 @@ RUN cd tmp \
  && pip install /tmp/im
 
 # Install pip optional libraries
-RUN pip install MySQL-python pyOpenSSL cheroot==8.1.0 pymongo msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-storage
+RUN pip install MySQL-python pyOpenSSL cheroot==8.1.0 pymongo msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns
+RUN pip install zipp==3.0.0
 
 # Set the VM_NUM_USE_CTXT_DIST to 3 for the tests
 RUN sed -i -e 's/VM_NUM_USE_CTXT_DIST = 30/VM_NUM_USE_CTXT_DIST = 3/g' /etc/im/im.cfg

docker-py3/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM service
 FROM ubuntu:18.04
 LABEL maintainer="Miguel Caballer <[email protected]>"
-LABEL version="1.9.2"
+LABEL version="1.9.3"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 
@@ -13,8 +13,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 openssh
 RUN apt-get update && apt-get install --no-install-recommends -y git python3-pip && \
      pip3 install pip setuptools --upgrade && \
      /usr/local/bin/pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns && \
-     /usr/local/bin/pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==2.7.16 && \
-     /usr/local/bin/pip3 install IM==1.9.2 && \
+     /usr/local/bin/pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==2.9.10&& \
+     /usr/local/bin/pip3 install IM==1.9.3 && \
      /usr/local/bin/pip3 uninstall pip -y && \
      apt-get purge -y git python3-pip && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/

docker/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM service
 FROM ubuntu:18.04
 LABEL maintainer="Miguel Caballer <[email protected]>"
-LABEL version="1.9.2"
+LABEL version="1.9.3"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 
@@ -13,11 +13,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y openssh-client
 RUN apt-get update && apt-get install --no-install-recommends -y gcc git python python-dev python-pip libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \
      pip install setuptools --upgrade -I && \
      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 msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns && \
      /usr/local/bin/pip install MySQL-python pyOpenSSL pycrypto xmltodict pymongo && \
-     # Install my version 2.7.0 (as is the last with support for pyton 2.7)
-     cd /tmp && git clone https://github.com/micafer/libcloud --branch=im_py27 && /usr/local/bin/pip install /tmp/libcloud && \
-     /usr/local/bin/pip install IM==1.9.2 && \
+     /usr/local/bin/pip install IM==1.9.3 && \
      /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 && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/