diff options
| -rw-r--r-- | conductor/conductor/api/adapters/aaf/aaf_authentication.py | 5 | ||||
| -rw-r--r-- | conductor/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rwxr-xr-x | run-dockers.sh | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/conductor/conductor/api/adapters/aaf/aaf_authentication.py b/conductor/conductor/api/adapters/aaf/aaf_authentication.py index f669ba4..e088024 100644 --- a/conductor/conductor/api/adapters/aaf/aaf_authentication.py +++ b/conductor/conductor/api/adapters/aaf/aaf_authentication.py @@ -81,16 +81,13 @@ def clear_cache(): perm_cache.clear() def authenticate(uid, passwd): - # FS - trace - LOG.info("Authenticating username:password {} : {}: ".format(uid, passwd)) - aafUser = None username = CONF.conductor_api.username password = CONF.conductor_api.password if username == uid and password == passwd: aafUser = CONF.aaf_api.aaf_conductor_user else: - LOG.debug("Error Authenticating the user {} : {}: ".format(uid, passwd)) + LOG.debug("Error Authenticating the user {} ".format(uid)) return False try: diff --git a/conductor/pom.xml b/conductor/pom.xml index bfcffd4..9d21f26 100644 --- a/conductor/pom.xml +++ b/conductor/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>org.onap.optf.has</groupId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.4-SNAPSHOT</version> <artifactId>optf-has</artifactId> </parent> <groupId>org.onap.optf.has</groupId> <artifactId>optf-has-conductor</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.4-SNAPSHOT</version> <name>optf-has-conductor</name> <description>Homing Allocation Service/Conductor</description> @@ -28,7 +28,7 @@ <artifactId>optf-has</artifactId> <name>optf-has</name> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.4-SNAPSHOT</version> <description>Homing Allocation Service</description> <modules> diff --git a/run-dockers.sh b/run-dockers.sh index edfae92..220e9bf 100755 --- a/run-dockers.sh +++ b/run-dockers.sh @@ -4,7 +4,7 @@ BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.3" +VERSION="1.2.4" PROJECT="optf-has" DOCKER_REPOSITORY="nexus3.onap.org:10003" IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}" diff --git a/version.properties b/version.properties index add6ba3..c61a792 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=2 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} |