Merge pull request #514 from grycap/devel

Devel

doc/source/radl.rst

@@ -417,9 +417,18 @@ the virtual machine.
 ``IM_NODE_FQDN``
    Complete FQDN of the virtual machine.
 
+``IM_NODE_PRIVATE_IP``
+   Private IP of the virtual machine. In case that the VM has more that one the first one will be returned.
+
+``IM_NODE_PUBLIC_IP``
+   Public IP of the virtual machine. In case that the VM has more that one the first one will be returned.
+
 ``IM_NODE_NUM``
    The value of the substitution ``#N#`` in the virtual machine.
 
+``IM_NODE_CLOUD_TYPE``
+   Cloud type where the VM has been deployed.
+
 ``IM_MASTER_HOSTNAME``
    Hostname (without the domain) of the virtual machine doing the *master*
    role.
@@ -442,6 +451,9 @@ the virtual machine.
 ``IM_NODE_NET_<iface num>_IP``
    The IP assigned to the network interface num ``iface num``.
 
+``IM_INFRASTRUCTURE_ID``
+   The identifier asigned by the IM to the infrastrucure this VM belongs to.
+
 ``IM_INFRASTRUCTURE_RADL``
    The RADL in JSON format: networks, systems and deploys. (from ver. 1.6.2). It enables to use
    RADL values in Ansible recipes. The ``.`` in the properties are replaced by ``_``

docker/Dockerfile

@@ -18,13 +18,13 @@ RUN pip install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-co
 RUN apt-get update && apt-get install --no-install-recommends -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \
      pip install MySQL-python && \
      pip install IM==1.6.6 && \
-     apt-get remove -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
-     apt-get autoremove -y && \
-     rm -rf /var/lib/apt/lists/*
+     apt-get purge -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
+     apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 
 # Remove pip requests and force python-requests to be installed to avoid SSL ca errors
 RUN pip uninstall -y requests
-RUN apt-get update && apt-get install --no-install-recommends -y python-requests && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install --no-install-recommends -y python-requests && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 
 # Copy a ansible.cfg with correct minimum values
 COPY ansible.cfg /etc/ansible/ansible.cfg