summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-11-01 15:52:04 -0700
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-11-01 15:52:04 -0700
commit633927402f317714069ae71e0ee766a0d54194ed (patch)
treeae92a8b96f1c9a0c2226dc7da99e1ce54a4673bc
parent17690987fe470a962164ec168dc805db8a511130 (diff)
Remove credentials in logger3.0.0-ONAP1.2.4
Removed log with credentials. Upgrade version to 1.2.4 Change-Id: Ic5767f149d7cd48a8596f325d90fe5138c213c31 Issue-ID: OPTFRA-331 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
-rw-r--r--conductor/conductor/api/adapters/aaf/aaf_authentication.py5
-rw-r--r--conductor/pom.xml4
-rw-r--r--pom.xml2
-rwxr-xr-xrun-dockers.sh2
-rw-r--r--version.properties2
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>
diff --git a/pom.xml b/pom.xml
index 966a96f..f78a091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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}