Skip to content

Commit

Permalink
Merge pull request #1410 from grycap/devel
Browse files Browse the repository at this point in the history
Update changelog
  • Loading branch information
micafer authored Sep 14, 2022
2 parents 6637f85 + 33b929a commit 97ae297
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion IM/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry',
'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPAdapter',
'VirtualMachine', 'VMRC', 'xmlobject']
__version__ = '1.11.1'
__version__ = '1.12.0'
__author__ = 'Miguel Caballer'


Expand Down
12 changes: 12 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -703,3 +703,15 @@ IM 1.11.0:
IM 1.11.1:
* Fix error in OpenStack connector setting microversion.
* Fix vo set in appdb image in EGI conn is not compared with auth data.

IM 1.12.0:
* Fix error creating snapshot in OpenNebula 6.
* Fix error deleting VMs in OpenNebula 6.
* Minor changes to support Keycloak EGI checkin.
* Enable to set a subnet in GCE.
* Add support for availability_zone in OpenStack conn.
* Fix error "No compatible OpenStack auth data has been specified.".
* In case of setting network_name using OST format (priv,pub) pub net is not assigned.
* Fix error getting OpenNebula quotas.
* Enable to get info from VM images from AppDB/AppDBIS or CMDB.

2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@type": "SoftwareSourceCode",
"identifier": "im",
"name": "Infrastructure Manager",
"version": "1.11.1",
"version": "1.12.0",
"description": "IM is a tool that deploys complex and customized virtual infrastructures on IaaS Cloud deployments",
"license": "GNU General Public License v3.0",
"author": [
Expand Down
2 changes: 1 addition & 1 deletion docker-devel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM ubuntu:20.04
ARG BRANCH=devel
LABEL maintainer="Miguel Caballer <[email protected]>"
LABEL version="1.11.1"
LABEL version="1.12.0"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899 8800

Expand Down
4 changes: 2 additions & 2 deletions docker-py3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile to create a container with the IM service
FROM ubuntu:20.04
LABEL maintainer="Miguel Caballer <[email protected]>"
LABEL version="1.11.1"
LABEL version="1.12.0"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899 8800

Expand All @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3
RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==2.9.26&& \
pip3 install IM==1.11.1 && \
pip3 install IM==1.12.0 && \
apt-get purge -y python3-pip git && \
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/

Expand Down
4 changes: 2 additions & 2 deletions test/files/test.radl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cpu.count>=1 and
memory.size>=1g and
net_interface.0.connection = 'privada' and
disk.0.os.name='linux' and
disk.0.image.url = 'one://ramses.i3m.upv.es/1129' and
disk.0.image.url = 'one://ramses.i3m.upv.es/1396' and
disk.0.os.credentials.new.password = 'Tututu+01' and
disk.0.applications contains (name='ganglia') and
disk.1.size=1GB and
Expand Down Expand Up @@ -62,7 +62,7 @@ configure test (
- vars:
NODENAME: '{{IM_INFRASTRUCTURE_RADL|json_query("[?id == ''front''].net_interface_0_dns_name|[0]")}}'
pre_tasks:
- apt: name=python-setuptools,python-pip update_cache=yes cache_valid_time=3600
- apt: name=python3-setuptools,python3-pip update_cache=yes cache_valid_time=3600
when: ansible_os_family == "Debian"
- yum: name=epel-release
when: ansible_os_family == "RedHat"
Expand Down
2 changes: 1 addition & 1 deletion test/files/test_cont_dist.radl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cpu.count>=1 and
memory.size>=1g and
net_interface.0.connection = 'privada' and
disk.0.os.name='linux' and
disk.0.image.url = 'one://ramses.i3m.upv.es/1129' and
disk.0.image.url = 'one://ramses.i3m.upv.es/1396' and
disk.0.os.credentials.new.password = 'Tututu+01'
)

Expand Down

0 comments on commit 97ae297

Please sign in to comment.