Merge "converting config to helm and setting demo values"

18 files changed, 249 insertions, 66 deletions

diff --git a/kubernetes/config/.helmignore b/kubernetes/config/.helmignore
new file mode 100644
index 0000000000..4c38baed31
--- /dev/null
+++ b/kubernetes/config/.helmignore
@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+
+#ignore config docker image files
+docker
+createConfig.sh
\ No newline at end of file
diff --git a/kubernetes/config/Chart.yaml b/kubernetes/config/Chart.yaml
new file mode 100644
index 0000000000..ddad999b9a
--- /dev/null
+++ b/kubernetes/config/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: ONAP configuration pod
+name: config
+version: 1.1.0
diff --git a/kubernetes/config/createConfig.sh b/kubernetes/config/createConfig.sh
index f226ccae47..154bad58ca 100755
--- a/kubernetes/config/createConfig.sh
+++ b/kubernetes/config/createConfig.sh
@@ -14,7 +14,7 @@ create_namespace() {
 
 create_configuration() {
   create_namespace $1
-  kubectl --namespace $1 create -f pod-config-init.yaml
+  helm install . --name "$1-config" --namespace $1 --set nsPrefix=$1
 }
 
 #MAINs
diff --git a/kubernetes/config/docker/init/Dockerfile b/kubernetes/config/docker/init/Dockerfile
index a1eb021b69..b6be90b247 100644
--- a/kubernetes/config/docker/init/Dockerfile
+++ b/kubernetes/config/docker/init/Dockerfile
@@ -1,5 +1,13 @@
 from ubuntu:16.04
 
+ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
+# Setup Corporate proxy
+ENV https_proxy ${HTTPS_PROXY}
+ENV http_proxy ${HTTP_PROXY}
+
+# Additional packages
+RUN apt-get update
+RUN apt-get install -y openssl vim-common
 RUN mkdir -p /opt/config/src/
 
 COPY onap-cfg.tar.gz /tmp/
diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 15b4181a75..cc3a0f62f4 100755
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -1,8 +1,27 @@
 #!/bin/bash
+
+echo "Validating onap-parameters.yaml has been populated"
+[[ -z "$OPENSTACK_UBUNTU_14_IMAGE" ]] && { echo "Error: OPENSTACK_UBUNTU_14_IMAGE must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_PUBLIC_NET_ID" ]] && { echo "Error: OPENSTACK_PUBLIC_NET_ID must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_OAM_NETWORK_ID" ]] && { echo "Error: OPENSTACK_OAM_NETWORK_ID must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_OAM_SUBNET_ID" ]] && { echo "Error: OPENSTACK_OAM_SUBNET_ID must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_OAM_NETWORK_CIDR" ]] && { echo "Error: OPENSTACK_OAM_NETWORK_CIDR must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_USERNAME" ]] && { echo "Error: OPENSTACK_USERNAME must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_API_KEY" ]] && { echo "Error: OPENSTACK_API_KEY must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_REGION" ]] && { echo "Error: OPENSTACK_REGION must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_KEYSTONE_URL" ]] && { echo "Error: OPENSTACK_KEYSTONE_URL must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_FLAVOUR_MEDIUM" ]] && { echo "Error: OPENSTACK_FLAVOUR_MEDIUM must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_SERVICE_TENANT_NAME" ]] && { echo "Error: OPENSTACK_SERVICE_TENANT_NAME must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$DMAAP_TOPIC" ]] && { echo "Error: DMAAP_TOPIC must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$DEMO_ARTIFACTS_VERSION" ]] && { echo "Error: DEMO_ARTIFACTS_VERSION must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_TENANT_NAME" ]] && { echo "Error: OPENSTACK_TENANT_NAME must be set in onap-parameters.yaml"; exit 1; }
+
 #make NAMESPACE directory
+echo "Creating $NAMESPACE directory if it doesn't exist"
 mkdir -p /config-init/$NAMESPACE/
 
 #unzip the configs in the NAMESPACEs directory ensuring no overwriting of files
+echo "Installing configuration files"
 cp -vnpr /opt/config/src/* /config-init/$NAMESPACE/
 
 #ensure db directories exist.
@@ -30,6 +49,7 @@ mkdir -p /config-init/$NAMESPACE/aai/search-data-service/logs/
 mkdir -p /config-init/$NAMESPACE/aai/data-router/logs/
 mkdir -p /config-init/$NAMESPACE/mso/mariadb/data
 
+echo "Setting permissions to container writeable directories"
 chmod -R 777 /config-init/$NAMESPACE/sdc/logs/
 chmod -R 777 /config-init/$NAMESPACE/portal/logs/
 chmod -R 777 /config-init/$NAMESPACE/aai/aai-config/
@@ -45,6 +65,46 @@ chmod -R 777 /config-init/$NAMESPACE/aai/search-data-service/logs/
 chmod -R 777 /config-init/$NAMESPACE/aai/data-router/logs/
 chmod -R 777 /config-init/$NAMESPACE/policy/mariadb/
 
+echo "Substituting configuration parameters"
 
 # replace the default 'onap' namespace qualification of K8s hostnames within the config files
 find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/\.onap-/\.$NAMESPACE-/g" {} \;
+# set the ubuntu 14 image
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/UBUNTU_14_IMAGE_NAME_HERE/$OPENSTACK_UBUNTU_14_IMAGE/g" {} \;
+# set the openstack public network uuid
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_PUBLIC_NET_ID_HERE/$OPENSTACK_PUBLIC_NET_ID/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE/$OPENSTACK_OAM_NETWORK_ID/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_SUBNET_ID_WITH_ONAP_ROUTE_HERE/$OPENSTACK_OAM_SUBNET_ID/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s,NETWORK_CIDR_WITH_ONAP_ROUTE_HERE,$OPENSTACK_OAM_NETWORK_CIDR,g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_USERNAME_HERE/$OPENSTACK_USERNAME/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_PASSWORD_HERE/$OPENSTACK_API_KEY/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_REGION_HERE/$OPENSTACK_REGION/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s,OPENSTACK_KEYSTONE_IP_HERE,$OPENSTACK_KEYSTONE_URL,g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_FLAVOUR_MEDIUM_HERE/$OPENSTACK_FLAVOUR_MEDIUM/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/DMAAP_TOPIC_HERE/$DMAAP_TOPIC/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_SERVICE_TENANT_NAME_HERE/$OPENSTACK_SERVICE_TENANT_NAME/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/DEMO_ARTIFACTS_VERSION_HERE/$DEMO_ARTIFACTS_VERSION/g" {} \;
+
+# SDNC/Robot preload files manipulation
+OPENSTACK_OAM_NETWORK_CIDR_PREFIX=`cut -d. -f1-3 <<<"$OPENSTACK_OAM_NETWORK_CIDR"`
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE/$OPENSTACK_OAM_NETWORK_CIDR_PREFIX/g" {} \;
+
+# MSO post install steps to encrypt openstack password
+MSO_ENCRYPTION_KEY=$(cat /config-init/$NAMESPACE/mso/mso/encryption.key)
+OPENSTACK_API_ENCRYPTED_KEY=`echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 25 -p`
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_ENCRYPTED_PASSWORD_HERE/$OPENSTACK_API_ENCRYPTED_KEY/g" {} \;
+
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_TENANT_NAME_HERE/$OPENSTACK_TENANT_NAME/g" {} \;
+
+echo "Done!"
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json b/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
index bdb39aae90..1b6d7084af 100755
--- a/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
+++ b/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
@@ -10,7 +10,7 @@
         "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
         "consumerGroup": "sdc-OpenSource-Env1",
         "consumerId": "sdc-COpenSource-Env11",
-        "environmentName": "SDC-OpenSource-Env1",
+        "environmentName": "DMAAP_TOPIC_HERE",
         "keyStorePassword": "",
         "keyStorePath": "",
         "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
@@ -117,20 +117,20 @@
       "checkrequiredparameters": "true",
       "cloud_sites": [{
         "aic_version": "2.5",
-        "id": "Ottawa",
-        "identity_service_id": "KVE5076_OPENSTACK",
-        "lcp_clli": "RegionOne",
-        "region_id": "RegionOne"
+        "id": "OPENSTACK_REGION_HERE",
+        "identity_service_id": "DEFAULT_KEYSTONE",
+        "lcp_clli": "OPENSTACK_REGION_HERE",
+        "region_id": "OPENSTACK_REGION_HERE"
       }],
       "identity_services": [{
-        "admin_tenant": "services",
-        "dcp_clli": "KVE5076_OPENSTACK",
+        "admin_tenant": "OPENSTACK_SERVICE_TENANT_NAME_HERE",
+        "dcp_clli": "DEFAULT_KEYSTONE",
         "identity_authentication_type": "USERNAME_PASSWORD",
         "identity_server_type": "KEYSTONE",
-        "identity_url": "http://OPENSTACK_KEYSTONE_IP_HERE:5000/v2.0",
+        "identity_url": "OPENSTACK_KEYSTONE_IP_HERE/v2.0",
         "member_role": "admin",
-        "mso_id": "dev",
-        "mso_pass": "dcdc0d9e4d69a667c67725a9e466e6c3",
+        "mso_id": "OPENSTACK_USERNAME_HERE",
+        "mso_pass": "OPENSTACK_ENCRYPTED_PASSWORD_HERE",
         "tenant_metadata": "true"
       }],
       "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
index 07edaa5c86..65c1711327 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
@@ -5,7 +5,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
         "pub_key" : "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqqnA9BAiMLtjOPSYBfhzLu4CiBolWoskDg4KVwhTJVTTeB6CqrQNcadlGXxOHhCYuNCKkUmIVF4WTOisVOJ75Z1c4OMoZLL85xVPKSIeH63kgVugwgPYQu55NbbWX+rsbUha3LnElDhNviMM3iTPbD5nnhKixNERAJMTLKXvZZZGqxW94bREknYPQTT2qrk3YRqwldncopp6Nkgv3AnSJz2gc9tjxnWF0poTQnQm/3D6hiJICrzKfAV0EaPN0KdtYjPhKrYoy6Qb/tKOVaaqsvwfKBJGrT9LfcA7D7M/yj292RT1XN63hI84WC383LsaPJ6eWdDTE6zUP1eGTWCoOw== rsa-key-20161026",
         "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
         "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging",
-        "demo_artifacts_version" : "1.0.0",
+        "demo_artifacts_version" : "DEMO_ARTIFACTS_VERSION_HERE",
          "ecomp_private_net_id" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE",
         "ecomp_private_subnet_id" : "OPENSTACK_SUBNET_ID_WITH_ONAP_ROUTE_HERE",
         "ecomp_private_net_cidr" : "NETWORK_CIDR_WITH_ONAP_ROUTE_HERE",
@@ -23,11 +23,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.20.0/24",
             "vfw_private_ip_0" : "192.168.10.100",
             "vfw_private_ip_1" : "192.168.20.100",
-            "vfw_private_ip_2" : "192.168.30.5",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.3",
             "vpg_private_ip_0" : "192.168.10.200",
-            "vpg_private_ip_1" : "192.168.30.3",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.4",
             "vsn_private_ip_0" : "192.168.20.250",
-            "vsn_private_ip_1" : "192.168.30.4",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.5",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vpg_name_0':'vofwl01pgn${hostid}',
             'vsn_name_0':'vofwl01snk${hostid}',
@@ -36,18 +36,18 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "volb01_private${hostid}",
             "vlb_private_net_cidr" : "192.168.30.0/24",
             "vlb_private_ip_0" : "192.168.30.100",
-            "vlb_private_ip_1" : "192.168.30.4",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.6",
             "vdns_private_ip_0" : "192.168.30.110",
-            "vdns_private_ip_1" : "192.168.30.5",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.7",
             'vlb_name_0':'vovlblb${hostid}',
             'vdns_name_0':'vovlbdns${hostid}',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "volb01_private${hostid}",
             "vlb_private_ip_0" : "192.168.30.100",
-            "vlb_private_ip_1" : "192.168.30.4",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.8",
             "vdns_private_ip_0" : "192.168.30.222",
-            "vdns_private_ip_1" : "192.168.30.6",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.9",
             'scaling_vdns_name_0':'vovlbscaling${hostid}',
         },
         "vvg_preload.template" : {
@@ -62,11 +62,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.120.0/24",
             "vfw_private_ip_0" : "192.168.110.100",
             "vfw_private_ip_1" : "192.168.120.100",
-            "vfw_private_ip_2" : "192.168.30.11",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.10",
             "vpg_private_ip_0" : "192.168.110.200",
-            "vpg_private_ip_1" : "192.168.30.12",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.11",
             "vsn_private_ip_0" : "192.168.120.250",
-            "vsn_private_ip_1" : "192.168.30.13",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vpg_name_0':'clfwl01pgn${hostid}',
             'vsn_name_0':'clfwl01snk${hostid}',
@@ -75,18 +75,18 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "cllb01_private${hostid}",
             "vlb_private_net_cidr" : "192.168.130.0/24",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13",
             "vdns_private_ip_0" : "192.168.130.110",
-            "vdns_private_ip_1" : "192.168.30.15",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14",
             'vlb_name_0':'clvlblb${hostid}',
             'vdns_name_0':'clvlbdns${hostid}',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "cllb01_private${hostid}",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15",
             "vdns_private_ip_0" : "192.168.130.222",
-            "vdns_private_ip_1" : "192.168.30.16",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16",
             'scaling_vdns_name_0':'clvlbscaling${hostid}',
         },
         "vvg_preload.template" : {
@@ -101,11 +101,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.120.0/24",
             "vfw_private_ip_0" : "192.168.110.100",
             "vfw_private_ip_1" : "192.168.120.100",
-            "vfw_private_ip_2" : "192.168.30.11",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.17",
             "vpg_private_ip_0" : "192.168.110.200",
-            "vpg_private_ip_1" : "192.168.30.12",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.18",
             "vsn_private_ip_0" : "192.168.120.250",
-            "vsn_private_ip_1" : "192.168.30.13",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.19",
             'vfw_name_0':'demofwl01fwl',
             'vpg_name_0':'demofwl01pgn',
             'vsn_name_0':'demofwl01snk',
@@ -114,21 +114,22 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "demolb_private",
             "vlb_private_net_cidr" : "192.168.130.0/24",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.20",
             "vdns_private_ip_0" : "192.168.130.110",
-            "vdns_private_ip_1" : "192.168.30.15",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.21",
             'vlb_name_0':'demovlblb',
             'vdns_name_0':'demovlbdns',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "demolb_private",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.16",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.22",
             "vdns_private_ip_0" : "192.168.130.222",
-            "vdns_private_ip_1" : "192.168.30.17",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.23",
             'scaling_vdns_name_0':'demovlbscaling',
         },
         "vvg_preload.template" : {
         }
     }
 }
+
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
index d0e0919b90..f1d0e98cc9 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
@@ -33,7 +33,7 @@ GLOBAL_MSO_SERVER_PORT = "8080"
 GLOBAL_MSO_USERNAME = "InfraPortalClient"
 GLOBAL_MSO_PASSWORD = "password1$"
 # openstack info - info to select right info in environment
-GLOBAL_OPENSTACK_TENANT_NAME = ""
+GLOBAL_OPENSTACK_TENANT_NAME = "OPENSTACK_TENANT_NAME_HERE"
 # packet generate vnf info - everything is from the private oam network (also called ecomp private network)
 GLOBAL_PACKET_GENERATOR_PORT = "8183"
 GLOBAL_PACKET_GENERATOR_USERNAME = "admin"
@@ -66,10 +66,10 @@ GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX"
 GLOBAL_VID_HEALTH_USERNAME = "Default"
 GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1"
 #global selenium info
-GLOBAL_PROXY_WARNING_TITLE=""
-GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
+GLOBAL_PROXY_WARNING_TITLE = ""
+GLOBAL_PROXY_WARNING_CONTINUE_XPATH = ""
 # settings for vm to attach vvg too
-GLOBAL_VVGSERVER_IMAGE = "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)"
-GLOBAL_VVGSERVER_FLAVOR = "4 GB General Purpose v1"
+GLOBAL_VVGSERVER_IMAGE = "UBUNTU_14_IMAGE_NAME_HERE"
+GLOBAL_VVGSERVER_FLAVOR = "OPENSTACK_FLAVOUR_MEDIUM_HERE"
 # dns info
-GLOBAL_DNS_TRAFFIC_DURATION = "600"
\ No newline at end of file
+GLOBAL_DNS_TRAFFIC_DURATION = "600"
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
index c2347d49d5..bc9d07c448 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
@@ -9,20 +9,20 @@ GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.onap-dcae"
 GLOBAL_INJECTED_DNS_IP_ADDR = "10.0.100.1"
 GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest"
 GLOBAL_INJECTED_GERRIT_BRANCH = "master"
-GLOBAL_INJECTED_KEYSTONE = "http://10.100.100.10:5000"
+GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE"
 GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router"
 GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso"
-GLOBAL_INJECTED_NETWORK = "oam_ecomp_1b5B"
+GLOBAL_INJECTED_NETWORK = "OPENSTACK_OAM_NETWORK_ID_HERE"
 GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001"
 GLOBAL_INJECTED_NEXUS_PASSWORD = "docker"
 GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw"
 GLOBAL_INJECTED_NEXUS_USERNAME = "docker"
-GLOBAL_INJECTED_OPENSTACK_PASSWORD = "dev"
-GLOBAL_INJECTED_OPENSTACK_USERNAME = "dev"
+GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE"
+GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE"
 GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy"
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy"
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal"
-GLOBAL_INJECTED_REGION = "RegionOne"
+GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE"
 GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc"
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc"
 GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc"
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env
new file mode 100644
index 0000000000..5c2330efcd
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env
@@ -0,0 +1,21 @@
+parameters:
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
+  bono_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  sprout_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  homer_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  homestead_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  ralf_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  ellis_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  dns_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  bono_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  sprout_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  homer_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  homestead_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  ralf_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  ellis_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  dns_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  repo_url: http://repo.cw-ngv.com/stable
+  zone: me.cw-ngv.com
+  dn_range_start: "2425550000"
+  dn_range_length: "10000"
+  dnssec_key: 9FPdYTWhk5+LbhrqtTPQKw==
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env
new file mode 100644
index 0000000000..1d09525ef0
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env
@@ -0,0 +1,4 @@
+parameters:
+  vfw_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vfw_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env
new file mode 100644
index 0000000000..e889ecc860
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env
@@ -0,0 +1,4 @@
+parameters:
+  vlb_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vlb_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env
new file mode 100644
index 0000000000..e889ecc860
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env
@@ -0,0 +1,4 @@
+parameters:
+  vlb_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vlb_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file
diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml
new file mode 100644
index 0000000000..3a74beddbb
--- /dev/null
+++ b/kubernetes/config/onap-parameters-sample.yaml
@@ -0,0 +1,14 @@
+OPENSTACK_UBUNTU_14_IMAGE: "Ubuntu_14.04.5_LTS"
+OPENSTACK_PUBLIC_NET_ID: "e8f51956-00dd-4425-af36-045716781ffc"
+OPENSTACK_OAM_NETWORK_ID: "d4769dfb-c9e4-4f72-b3d6-1d18f4ac4ee6"
+OPENSTACK_OAM_SUBNET_ID: "191f7580-acf6-4c2b-8ec0-ba7d99b3bc4e"
+OPENSTACK_OAM_NETWORK_CIDR: "192.168.30.0/24"
+OPENSTACK_USERNAME: "vnf_user"
+OPENSTACK_API_KEY: "vnf_password"
+OPENSTACK_TENANT_NAME: "vnfs"
+OPENSTACK_REGION: "RegionOne"
+OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000"
+OPENSTACK_FLAVOUR_MEDIUM: "m1.medium"
+OPENSTACK_SERVICE_TENANT_NAME: "services"
+DMAAP_TOPIC: "AUTO"
+DEMO_ARTIFACTS_VERSION: "1.1.0-SNAPSHOT"
diff --git a/kubernetes/config/onap-parameters.yaml b/kubernetes/config/onap-parameters.yaml
new file mode 100644
index 0000000000..62ccc83122
--- /dev/null
+++ b/kubernetes/config/onap-parameters.yaml
@@ -0,0 +1,14 @@
+OPENSTACK_UBUNTU_14_IMAGE: ""
+OPENSTACK_PUBLIC_NET_ID: ""
+OPENSTACK_OAM_NETWORK_ID: ""
+OPENSTACK_OAM_SUBNET_ID: ""
+OPENSTACK_OAM_NETWORK_CIDR: ""
+OPENSTACK_USERNAME: ""
+OPENSTACK_API_KEY: ""
+OPENSTACK_TENANT_NAME: ""
+OPENSTACK_REGION: ""
+OPENSTACK_KEYSTONE_URL: ""
+OPENSTACK_FLAVOUR_MEDIUM: ""
+OPENSTACK_SERVICE_TENANT_NAME: ""
+DMAAP_TOPIC: ""
+DEMO_ARTIFACTS_VERSION: ""
diff --git a/kubernetes/config/pod-config-init.yaml b/kubernetes/config/pod-config-init.yaml
deleted file mode 100644
index b1285ce21d..0000000000
--- a/kubernetes/config/pod-config-init.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: config-init
-spec:
-  containers:
-    - name: config-init
-      env:
-      - name: NAMESPACE
-        valueFrom:
-          fieldRef:
-            fieldPath: metadata.namespace
-      image: oomk8s/config-init:1.1.0
-      imagePullPolicy: Always
-      volumeMounts:
-      - name: config-init-root
-        mountPath: /config-init/
-  volumes:
-    - name: config-init-root
-      hostPath:
-        path: /dockerdata-nfs/
-  restartPolicy: Never
diff --git a/kubernetes/config/templates/pod.yaml b/kubernetes/config/templates/pod.yaml
new file mode 100644
index 0000000000..296ebba64c
--- /dev/null
+++ b/kubernetes/config/templates/pod.yaml
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: global-onap-configmap
+  namespace: "{{ .Values.nsPrefix }}"
+data:
+  {{ (.Files.Glob "{{ .Values.parameterFile }}").AsConfig | indent 2 }}
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: "{{ .Values.nsPrefix }}"
+spec:
+  containers:
+    - name: {{ .Chart.Name }}
+      image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      imagePullPolicy: {{ .Values.image.pullPolicy }}
+      envFrom:
+        - configMapRef:
+            name: global-onap-configmap
+      env:
+      - name: NAMESPACE
+        valueFrom:
+          fieldRef:
+            fieldPath: metadata.namespace
+      - name: NAMESPACE_PREFIX
+        value: {{ .Values.nsPrefix }}            
+      - name: DOCKER_SHARE_PATH
+        value: {{ .Values.dockerSharePath }}
+      volumeMounts:
+      - name: config-init-root
+        mountPath: /config-init/
+  volumes:
+    - name: config-init-root
+      hostPath:
+        path: {{ .Values.dockerSharePath }}
+  restartPolicy: Never
\ No newline at end of file
diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml
new file mode 100644
index 0000000000..329ed8ebee
--- /dev/null
+++ b/kubernetes/config/values.yaml
@@ -0,0 +1,8 @@
+# Default values for config.
+nsPrefix: onap
+dockerSharePath: /dockerdata-nfs
+parameterFile: onap-parameters.yaml
+image:
+  repository: oomk8s/config-init
+  tag: 1.1.0
+  pullPolicy: Always
\ No newline at end of file