diff options
Diffstat (limited to 'starlingx')
| -rwxr-xr-x | starlingx/docker/build_image.sh | 4 | ||||
| -rw-r--r-- | starlingx/pom.xml | 4 | ||||
| -rw-r--r-- | starlingx/starlingx/proxy/urls.py | 2 | ||||
| -rw-r--r-- | starlingx/starlingx/proxy/urlsV1.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/starlingx/docker/build_image.sh b/starlingx/docker/build_image.sh index 001f9701..a4f4b51f 100755 --- a/starlingx/docker/build_image.sh +++ b/starlingx/docker/build_image.sh @@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -VERSION="1.4.1-SNAPSHOT" -STAGING="1.4.1-STAGING" +VERSION="1.5.0-SNAPSHOT" +STAGING="1.5.0-STAGING" OS_VERSION="starlingx" IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" diff --git a/starlingx/pom.xml b/starlingx/pom.xml index f018ea1c..3ea35665 100644 --- a/starlingx/pom.xml +++ b/starlingx/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-root</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-starlingx</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-openstack-starlingx</name> <description>multicloud for openstack starlingx</description> diff --git a/starlingx/starlingx/proxy/urls.py b/starlingx/starlingx/proxy/urls.py index cde9e2b2..453bf521 100644 --- a/starlingx/starlingx/proxy/urls.py +++ b/starlingx/starlingx/proxy/urls.py @@ -34,7 +34,7 @@ URLPATTERNS = [ services.GetTenants.as_view()), url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$', dnsaasdelegate.DnsaasDelegate.as_view()), - url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', + url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', services.Services.as_view()), ] diff --git a/starlingx/starlingx/proxy/urlsV1.py b/starlingx/starlingx/proxy/urlsV1.py index 7fca18e1..d774b483 100644 --- a/starlingx/starlingx/proxy/urlsV1.py +++ b/starlingx/starlingx/proxy/urlsV1.py @@ -32,7 +32,7 @@ URLPATTERNS = [ services.APIv1GetTenants.as_view()), url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$', dnsaasdelegate.APIv1DnsaasDelegate.as_view()), - url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', + url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', services.APIv1Services.as_view()), ] |