summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conductor/conductor/common/sms.py2
-rw-r--r--conductor/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
4 files changed, 5 insertions, 5 deletions
diff --git a/conductor/conductor/common/sms.py b/conductor/conductor/common/sms.py
index b8f0649..35ca644 100644
--- a/conductor/conductor/common/sms.py
+++ b/conductor/conductor/common/sms.py
@@ -116,7 +116,7 @@ def load_secrets():
def decrypt_pass(passwd):
- if passwd == '' or passwd == 'NA':
+ if not CONF.auth.appkey or passwd == '' or passwd == 'NA':
return passwd
else:
return cipherUtils.AESCipher.get_instance().decrypt(passwd)
diff --git a/conductor/pom.xml b/conductor/pom.xml
index ccfbc81..ad93782 100644
--- a/conductor/pom.xml
+++ b/conductor/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.onap.optf.has</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<artifactId>optf-has</artifactId>
</parent>
<groupId>org.onap.optf.has</groupId>
<artifactId>optf-has-conductor</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<name>optf-has-conductor</name>
<description>Homing Allocation Service/Conductor</description>
diff --git a/pom.xml b/pom.xml
index edf8754..e59d307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>optf-has</artifactId>
<name>optf-has</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<description>Homing Allocation Service</description>
<modules>
diff --git a/version.properties b/version.properties
index 2fdb205..afa53c0 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
major=2
minor=0
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}