commit ed4765788337be39f6f339a753d761da209cf03f
author David Bainbridge <dbainbri@ciena.com> Tue Jun 02 14:05:45 2020 -0700
committer David Bainbridge <dbainbri@ciena.com> Tue Jun 02 17:57:34 2020 -0700
tree cad38d08ebc6a6440f8b4848e1fdef1c8e5bedd1
parent 43f2df528e0f10054409305df88b7cfa01929311

VOL-3159 - remove ofagent-py

Change-Id: I24aa896fbc5b53343c8fe36dc4f40cba7978df66

voltha

diff --git a/voltha b/voltha
index e44e1df..ff3897c 100755
--- a/voltha
+++ b/voltha
@@ -87,7 +87,6 @@
 WITH_KAFKA=${WITH_KAFKA:-yes}
 WITH_ETCD=${WITH_ETCD:-yes}
 WITH_PPROF=${WITH_PPROF:-no}
-ONLY_ONE=${ONLY_ONE:-yes}
 SCHEDULE_ON_CONTROL_NODES=${SCHEDULE_ON_CONTROL_NODES:-no}
 CONFIG_SADIS=${CONFIG_SADIS:-no} # yes | no | file | bbsim | external | URL
 SADIS_CFG=${SADIS_CFG:-onos-files/onos-sadis-sample.json}
@@ -274,7 +273,6 @@
     HELM_USE_UPGRADE \
     UPDATE_HELM_REPOS \
     WAIT_ON_DOWN \
-    ONLY_ONE \
     VOLTHA_DOWN_ON_TIMEOUT \
     LEGACY_BBSIM_INDEX \
     SCHEDULE_ON_CONTROL_NODES \
@@ -1891,13 +1889,9 @@
 fi
 
 STIME="$(date +%s)"
-EXPECT=1
-if [ "$ONLY_ONE" == "yes" ]; then
-    EXPECT="$((EXPECT+1))"
-    INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set therecanbeonlyone=true"
-else
-    EXPECT="$((EXPECT+2))"
-fi
+EXPECT=2
+# therecanbeonlyone set hardcoded to true for backward compatibility
+INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set therecanbeonlyone=true"
 case $WITH_ETCD in
     no)
         ;;