Merge "Fix Robot vm_properties.py params" into release-1.1.0

diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml
index 081bc9d..51d5138 100644 (file)
--- a/kubernetes/config/onap-parameters-sample.yaml
+++ b/kubernetes/config/onap-parameters-sample.yaml
@@ -10,6 +10,6 @@ OPENSTACK_TENANT_ID: "47899782ed714295b1151681fdfd51f5"
 OPENSTACK_REGION: "RegionOne"
 OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000"
 OPENSTACK_FLAVOUR_MEDIUM: "m1.medium"
-OPENSTACK_SERVICE_TENANT_NAME: "services"
+OPENSTACK_SERVICE_TENANT_NAME: "service"
 DMAAP_TOPIC: "AUTO"
 DEMO_ARTIFACTS_VERSION: "1.1.0-SNAPSHOT"

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index e8c7f55..8267ac9 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -59,7 +59,7 @@ spec:
         - name: VID_MSO_SERVER_URL
           value: http://mso.{{ .Values.nsPrefix }}-mso:8080
         - name: VID_MSO_PASS
-          value: 51515201a8d4c5c08d533db9bd1e1a9b
+          value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
           value: http://localhost:8081
         - name: MSO_DME2_ENABLED