Remove dead configuration variables

Change-Id: I3b2f3009ba792e739a30c0cf4fd1a0f80bbca281
Issue-ID: VFC-728
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>

diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index 288404b..e328fd8 100755 (executable)
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -64,8 +64,5 @@ docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:
 docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
 docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
 
-CBAM_IP=$(cat /opt/config/cbam_ip.txt)
 VNFM_ID=vnfmUuid
-CBAM_PASSWORD=$(cat /opt/config/cbam_password.txt)
-CBAM_USERNAME=$(cat /opt/config/cbam_username.txt)
-docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "CBAM_CATALOG_URL=https://$CBAM_IP:443/api/catalog/adapter/" -e "CBAM_LCN_URL=https://$CBAM_IP:443/vnfm/lcn/v3/" -e "CBAM_KEYCLOAK_URL=https://$CBAM_IP:443/auth/" -e "CBAM_USERNAME=$CBAM_USERNAME" -e "CBAM_PASSWORD=$CBAM_PASSWORD" -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index fa421e4..aeedf6b 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -199,16 +199,6 @@ parameters:
   vfc_wfengine_activiti_docker: latest
   vfc_multivimproxy_docker: 1.0.0-STAGING-latest
 
-  ############################################
-  #                                          #
-  # Parameters used by Nokia v2 SVNFM driver #
-  #                                          #
-  ############################################
-
-  cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
-  cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
-
   #####################
   #                   #
   # ONAP repositories #

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 21573cf..83efdea 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -466,13 +466,6 @@ parameters:
   vfc_multivimproxy_docker:
     type: string
 
-  cbam_username:
-    type: string
-  cbam_password:
-    type: string
-  cbam_ip:
-    type: string
-
   aai_branch:
     type: string
   appc_branch:
@@ -1682,9 +1675,6 @@ resources:
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
             __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
             __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
-            __cbam_ip__: { get_param: cbam_ip }
-            __cbam_username__: { get_param: cbam_username }
-            __cbam_password__: { get_param: cbam_password }
             __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
             __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
             __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
@@ -1721,9 +1711,6 @@ resources:
             echo "__uui_docker__" > /opt/config/uui_docker.txt
             echo "__esr_docker__" > /opt/config/esr_docker.txt
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
-            echo "__cbam_ip__" > /opt/config/cbam_ip.txt
-            echo "__cbam_username__" > /opt/config/cbam_username.txt
-            echo "__cbam_password__" > /opt/config/cbam_password.txt
 
             echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
             echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt