From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 4 May 2018 13:35:13 +0000 (-0700)
Subject: Remove dead configuration variables
X-Git-Tag: v1.2.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3262be122071e0d330ff70ebb4581adc48f9b41f;p=demo.git

Remove dead configuration variables

Change-Id: I589d4791282c350f7c32b47f399701f7ffdba4d3
Issue-ID: VFC-728
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 0aea45c5..c40b4195 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -202,16 +202,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_template.env b/heat/ONAP/onap_openstack_template.env
index 9f32e394..b731a34e 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -202,16 +202,6 @@ parameters:
   vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
   vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
 
-  ############################################
-  #                                          #
-  # 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 #