diff options
Diffstat (limited to 'pike')
| -rwxr-xr-x | pike/docker/build_image.sh | 4 | ||||
| -rw-r--r-- | pike/pike/proxy/urls.py | 2 | ||||
| -rw-r--r-- | pike/pike/proxy/urls_v1.py | 2 | ||||
| -rw-r--r-- | pike/pom.xml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh index fcfea6b7..5e520e2b 100755 --- a/pike/docker/build_image.sh +++ b/pike/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="pike" IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" diff --git a/pike/pike/proxy/urls.py b/pike/pike/proxy/urls.py index b92b5354..a1020215 100644 --- a/pike/pike/proxy/urls.py +++ b/pike/pike/proxy/urls.py @@ -32,7 +32,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/pike/pike/proxy/urls_v1.py b/pike/pike/proxy/urls_v1.py index 4ab75947..8d2fa66e 100644 --- a/pike/pike/proxy/urls_v1.py +++ b/pike/pike/proxy/urls_v1.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()), ] diff --git a/pike/pom.xml b/pike/pom.xml index 831e8c22..f682f002 100644 --- a/pike/pom.xml +++ b/pike/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-pike</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-openstack-pike</name> <description>multicloud for openstack pike</description> |