diff --git a/IM/InfrastructureList.py b/IM/InfrastructureList.py index c5c85d4b..c9b1d99c 100644 --- a/IM/InfrastructureList.py +++ b/IM/InfrastructureList.py @@ -254,6 +254,8 @@ def _gen_where_from_auth(auth): like = "" if auth: for elem in auth.getAuthInfo('InfrastructureManager'): + if elem.get("admin"): + return "" if elem.get("username"): if like: like += " or " @@ -266,6 +268,8 @@ def _gen_filter_from_auth(auth): like = "" if auth: for elem in auth.getAuthInfo('InfrastructureManager'): + if elem.get("admin"): + return {} if elem.get("username"): if like: like += "|" diff --git a/changelog b/changelog index 77516b44..dfaa04b2 100644 --- a/changelog +++ b/changelog @@ -773,5 +773,7 @@ IM 1.17.0: * Do not create router in OST if no networks are created. IM 1.17.1: - * Fix problem with 0 disk flavors in OpenStack. + * Add support to other format SSH keys. * Speed up Ansible installation using newer versions. + * Fix problem with 0 disk flavors in OpenStack. + * Flush Inf data to DB in case of service termination. diff --git a/doc/source/conf.py b/doc/source/conf.py index 85c9c1c8..54bfd468 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -4,7 +4,7 @@ author = 'micafer' version = '1.17' -release = '1.17.0' +release = '1.17.1' master_doc = 'index' diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile index 4c6b80d5..fc6ee4a9 100644 --- a/docker-devel/Dockerfile +++ b/docker-devel/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 ARG BRANCH=devel LABEL maintainer="Miguel Caballer " -LABEL version="1.17.0" +LABEL version="1.17.1" LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)" EXPOSE 8899 8800 diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile index d6a9843c..5b7c8efc 100644 --- a/docker-py3/Dockerfile +++ b/docker-py3/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile to create a container with the IM service FROM ubuntu:22.04 -ENV VERSION=1.17.0 +ENV VERSION=1.17.1 LABEL maintainer="Miguel Caballer " LABEL version="${VERSION}"