Merge "config seg aai resources and traversal"

9 files changed, 355 insertions, 10 deletions

diff --git a/kubernetes/aai/resources/config/aai-data/chef-config/dev/.knife/solo.rb b/kubernetes/aai/resources/config/aai-data/chef-config/dev/.knife/solo.rb
new file mode 100644
index 0000000000..3d903adcc5
--- /dev/null
+++ b/kubernetes/aai/resources/config/aai-data/chef-config/dev/.knife/solo.rb
@@ -0,0 +1,9 @@
+current_dir = File.dirname(__FILE__)
+org         = ENV['CHEF_ORG']     || "aai-dev"
+env         = ENV['AAI_CHEF_ENV'] || "dev"
+env_path    = ENV['AAI_CHEF_LOC'] || ""
+node_name                "chef-node"
+cookbook_path [ "/var/chef/aai-config/cookbooks" ]
+environment_path "#{env_path}"
+log_level :info
+log_location STDOUT
\ No newline at end of file
diff --git a/kubernetes/aai/resources/config/aai-data/environments/README.md b/kubernetes/aai/resources/config/aai-data/environments/README.md
new file mode 100644
index 0000000000..3fa254d25a
--- /dev/null
+++ b/kubernetes/aai/resources/config/aai-data/environments/README.md
@@ -0,0 +1,8 @@
+Requires Chef 0.10.0+.
+
+This directory is for Ruby DSL and JSON files for environments. 
+It will contain the A&AI environment files.
+For more information see "About Environments" in the Chef documentation:
+
+http://docs.chef.io/environments.html
+
diff --git a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
new file mode 100644
index 0000000000..99edba2bed
--- /dev/null
+++ b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
@@ -0,0 +1,124 @@
+{
+  "name": "simpledemo",
+  "description": "Development Environment",
+  "cookbook_versions": {
+  		"aai-traversal-auth" : "= 1.0.0",
+		"aai-traversal-config" : "= 1.0.0",
+		"aai-traversal-process" : "= 1.0.0",
+
+  		"aai-resources-auth" : "= 1.0.0",
+		"aai-resources-config" : "= 1.0.0",
+		"aai-resources-process" : "= 1.0.0"
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+    "aai-traversal-config": {
+		"SERVICE_API_VERSION": "1.0.1",
+		"SOA_CLOUD_NAMESPACE": "org.openecomp.aai",
+		"AJSC_SERVICE_NAMESPACE": "traversal",
+		"AFTSWM_ACTION_ARTIFACT_NAME": "traversal",
+		"AJSC_JETTY_ThreadCount_MAX": "500",
+		"AJSC_JETTY_ThreadCount_MIN": "10",
+		"AJSC_SSL_PORT": "8446",
+		"AJSC_SVC_PORT": "8083",
+		"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"MAX_HEAP_SIZE": "2056m",
+		"MAX_PERM_SIZE": "512M",
+		"MIN_HEAP_SIZE": "2056m",
+		"PERM_SIZE": "512M",
+		"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+		"AAIENV": "dev",
+		"PROJECT_HOME": "/opt/app/aai-traversal",
+		"LOGROOT": "/opt/aai/logroot",
+		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"AAI_KEYSTORE_FILENAME": "aai_keystore",
+		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"AAI_DMAAP_PROTOCOL": "http",
+		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+		"RESOURCE_VERSION_ENABLE_FLAG": "true",
+		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HBASE_TABLE": "aaigraph.dev",
+		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"DB_CACHE_CLEAN_WAIT": "20",
+		"DB_CACHE_TIME": "180000",
+		"DB_CACHE_SIZE": "0.3",
+		"AAI_DEFAULT_API_VERSION": "v11"
+    },
+        "aai-resources-config": {
+		"SERVICE_API_VERSION": "1.0.1",
+		"AJSC_SERVICE_NAMESPACE": "aai-resources",
+		"AFTSWM_ACTION_ARTIFACT_NAME": "aai-resources",
+		"AJSC_JETTY_ThreadCount_MAX": "500",
+		"AJSC_JETTY_ThreadCount_MIN": "10",
+		"AJSC_SSL_PORT": "8447",
+		"AJSC_SVC_PORT": "8087",
+		"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"MAX_HEAP_SIZE": "2056m",
+		"MAX_PERM_SIZE": "512M",
+		"MIN_HEAP_SIZE": "2056m",
+		"PERM_SIZE": "512M",
+		"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+		"AAIENV": "dev",
+		"PROJECT_HOME": "/opt/app/aai-resources",
+		"LOGROOT": "/opt/aai/logroot",
+		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"AAI_KEYSTORE_FILENAME": "aai_keystore",
+		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"AAI_DMAAP_PROTOCOL": "http",
+		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+		"RESOURCE_VERSION_ENABLE_FLAG": "true",
+		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
+		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HBASE_TABLE": "aaigraph.dev",
+		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"DB_CACHE_CLEAN_WAIT": "20",
+		"DB_CACHE_TIME": "180000",
+		"DB_CACHE_SIZE": "0.3",
+		"AAI_DEFAULT_API_VERSION": "v11"
+    }
+  },
+  "override_attributes": {
+  }
+}
diff --git a/kubernetes/aai/resources/config/aai-data/environments/solo.json b/kubernetes/aai/resources/config/aai-data/environments/solo.json
new file mode 100644
index 0000000000..ac83173908
--- /dev/null
+++ b/kubernetes/aai/resources/config/aai-data/environments/solo.json
@@ -0,0 +1,123 @@
+{
+  "name": "local",
+  "description": "Development Environment",
+  "cookbook_versions": {
+  		"aai-traversal-auth" : "= 1.0.0",
+		"aai-traversal-config" : "= 1.0.0",
+		"aai-traversal-process" : "= 1.0.0",
+
+  		"aai-resources-auth" : "= 1.0.0",
+		"aai-resources-config" : "= 1.0.0",
+		"aai-resources-process" : "= 1.0.0"
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+    "aai-traversal-config": {
+		"SERVICE_API_VERSION": "1.0.1",
+		"AJSC_SERVICE_NAMESPACE": "traversal",
+		"AFTSWM_ACTION_ARTIFACT_NAME": "traversal",
+		"AJSC_JETTY_ThreadCount_MAX": "500",
+		"AJSC_JETTY_ThreadCount_MIN": "10",
+		"AJSC_SSL_PORT": "8446",
+		"AJSC_SVC_PORT": "8083",
+		"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"MAX_HEAP_SIZE": "2056m",
+		"MAX_PERM_SIZE": "512M",
+		"MIN_HEAP_SIZE": "2056m",
+		"PERM_SIZE": "512M",
+		"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+		"AAIENV": "dev",
+		"PROJECT_HOME": "/opt/app/aai-traversal",
+		"LOGROOT": "/opt/aai/logroot",
+		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+		"AAI_SERVER_URL_BASE": "https://localhost:8443/aai/",
+		"AAI_SERVER_URL": "https://localhost:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://localhost:8443/aai/",
+		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"AAI_KEYSTORE_FILENAME": "aai_keystore",
+		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"APPLICATION_SERVERS": "localhost",
+		"AAI_DMAAP_PROTOCOL": "http",
+		"AAI_DMAAP_HOST_PORT": "localhost:3904",
+		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+		"RESOURCE_VERSION_ENABLE_FLAG": "true",
+		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
+		"TXN_ZOOKEEPER_QUORUM": "localhost",
+		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+		"STORAGE_HOSTNAME": "localhost",
+		"STORAGE_HBASE_TABLE": "aaigraph.dev",
+		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"DB_CACHE_CLEAN_WAIT": "20",
+		"DB_CACHE_TIME": "180000",
+		"DB_CACHE_SIZE": "0.3",
+		"AAI_DEFAULT_API_VERSION": "v11"
+    },
+        "aai-resources-config": {
+		"SERVICE_API_VERSION": "1.0.1",
+		"AJSC_SERVICE_NAMESPACE": "aai-resources",
+		"AFTSWM_ACTION_ARTIFACT_NAME": "aai-resources",
+		"AJSC_JETTY_ThreadCount_MAX": "500",
+		"AJSC_JETTY_ThreadCount_MIN": "10",
+		"AJSC_SSL_PORT": "8447",
+		"AJSC_SVC_PORT": "8087",
+		"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"MAX_HEAP_SIZE": "2056m",
+		"MAX_PERM_SIZE": "512M",
+		"MIN_HEAP_SIZE": "2056m",
+		"PERM_SIZE": "512M",
+		"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+		"AAIENV": "dev",
+		"PROJECT_HOME": "/opt/app/aai-resources",
+		"LOGROOT": "/opt/aai/logroot",
+		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+		"AAI_SERVER_URL_BASE": "https://localhost:8443/aai/",
+		"AAI_SERVER_URL": "https://localhost:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https://localhost:8443/aai/",
+		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"AAI_KEYSTORE_FILENAME": "aai_keystore",
+		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+		"APPLICATION_SERVERS": "localhost",
+		"AAI_DMAAP_PROTOCOL": "http",
+		"AAI_DMAAP_HOST_PORT": "localhost:3904",
+		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+		"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+		"RESOURCE_VERSION_ENABLE_FLAG": "true",
+		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
+		"TXN_ZOOKEEPER_QUORUM": "localhost",
+		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+		"STORAGE_HOSTNAME": "localhost",
+		"STORAGE_HBASE_TABLE": "aaigraph.dev",
+		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+		"DB_CACHE_CLEAN_WAIT": "20",
+		"DB_CACHE_TIME": "180000",
+		"DB_CACHE_SIZE": "0.3",
+		"AAI_DEFAULT_API_VERSION": "v11"
+    }
+  },
+  "override_attributes": {
+  }
+}
diff --git a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml
new file mode 100644
index 0000000000..f316b866af
--- /dev/null
+++ b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml
@@ -0,0 +1,41 @@
+filebeat.prospectors:
+#it is mandatory, in our case it's log
+- input_type: log
+  #This is the canolical path as mentioned in logback.xml, *.* means it will monitor all files in the directory.
+  paths:
+    - /var/log/onap/*/*/*/*.log
+    - /var/log/onap/*/*/*.log
+    - /var/log/onap/*/*.log
+  #Files older than this should be ignored.In our case it will be 48 hours i.e. 2 days. It is a helping flag for clean_inactive
+  ignore_older: 48h
+  # Remove the registry entry for a file that is more than the specified time. In our case it will be 96 hours, i.e. 4 days. It will help to keep registry records with in limit
+  clean_inactive: 96h
+
+
+# Name of the registry file. If a relative path is used, it is considered relative to the
+# data path. Else full qualified file name.
+#filebeat.registry_file: ${path.data}/registry
+
+
+output.logstash:
+  #List of logstash server ip addresses with port number.
+  #But, in our case, this will be the loadbalancer IP address.
+  #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
+  hosts: ["logstash.onap-log:5044"]
+  #If enable will do load balancing among availabe Logstash, automatically.
+  loadbalance: true
+
+  #The list of root certificates for server verifications.
+  #If certificate_authorities is empty or not set, the trusted
+  #certificate authorities of the host system are used.
+  #ssl.certificate_authorities: $ssl.certificate_authorities
+
+  #The path to the certificate for SSL client authentication. If the certificate is not specified,
+  #client authentication is not available.
+  #ssl.certificate: $ssl.certificate
+
+  #The client certificate key used for client authentication.
+  #ssl.key: $ssl.key
+
+  #The passphrase used to decrypt an encrypted key stored in the configured key file
+  #ssl.key_passphrase: $ssl.key_passphrase
diff --git a/kubernetes/aai/templates/aai-filebeat-configmap.yaml b/kubernetes/aai/templates/aai-filebeat-configmap.yaml
new file mode 100644
index 0000000000..5a123a54a0
--- /dev/null
+++ b/kubernetes/aai/templates/aai-filebeat-configmap.yaml
@@ -0,0 +1,9 @@
+#{{ if not .Values.disableAaiAaiResources }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-filebeat-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index 7ff5e66ee2..5ca0c165df 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -50,7 +50,10 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /var/chef/aai-data/
+        - mountPath: /var/chef/aai-data/chef-config/dev/.knife/solo.rb
+          subPath: solo.rb
+          name: aai-chef-config
+        - mountPath: /var/chef/aai-data/environments/
           name: aai-data
         - mountPath: /var/log/onap
           name: aai-resources-logs
@@ -69,6 +72,7 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
           name: filebeat-conf
         - mountPath: /var/log/onap
           name: aai-resources-logs
@@ -78,12 +82,15 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
+      - name: aai-chef-config
+        configMap:
+          name: aai-chef-config-configmap
       - name: aai-data
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+        configMap:
+          name: aai-resources-environments-configmap
       - name: filebeat-conf
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        configMap:
+          name: aai-filebeat-configmap
       - name: aai-resources-logs
         emptyDir: {}
       - name: aai-resources-filebeat
diff --git a/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml
new file mode 100644
index 0000000000..772c3a79c8
--- /dev/null
+++ b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml
@@ -0,0 +1,17 @@
+#{{ if not .Values.disableAaiAaiResources }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-chef-config-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-resources-environments-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index f659392935..fda0055d21 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -52,7 +52,10 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /var/chef/aai-data/
+        - mountPath: /var/chef/aai-data/chef-config/dev/.knife/solo.rb
+          subPath: solo.rb
+          name: aai-chef-config
+        - mountPath: /var/chef/aai-data/environments/
           name: aai-data
         - mountPath: /var/log/onap
           name: aai-traversal-logs
@@ -71,6 +74,7 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
           name: filebeat-conf
         - mountPath: /var/log/onap
           name: aai-traversal-logs
@@ -80,12 +84,15 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
+      - name: aai-chef-config
+        configMap:
+          name: aai-chef-config-configmap
       - name: aai-data
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+        configMap:
+          name: aai-resources-environments-configmap
       - name: filebeat-conf
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        configMap:
+          name: aai-filebeat-configmap
       - name: aai-traversal-logs
         emptyDir: {}
       - name: aai-traversal-filebeat