77 files changed, 785 insertions, 993 deletions

diff --git a/.gitignore b/.gitignore
index d8fe4fa..b195f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/.project
+.classpath
+.project
+.settings/
+/.buildpath
diff --git a/cookbooks/README.md b/cookbooks/README.md
deleted file mode 100644
index c7ec3b0..0000000
--- a/cookbooks/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
-
-Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
-
-    cookbook_path ["./cookbooks"]
-
-This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used:
-
-    current_dir = File.dirname(__FILE__)
-    cookbook_path ["#{current_dir}/../cookbooks"]
-
-Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`).
-
-Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`.
-
-    cookbook_copyright "Example, Com."
-    cookbook_email     "cookbooks@example.com"
-    cookbook_license   "apachev2"
-
-Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3",  or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
-
-Create new cookbooks in this directory with Knife.
-
-    knife cookbook create COOKBOOK
-
-This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe.
-
-You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is.
-
-The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife.
-
-    knife cookbook site install COOKBOOK
-
-This will:
-
-* Download the cookbook tarball from the Chef Supermarket.
-* Ensure its on the git master branch.
-* Checks for an existing vendor branch, and creates if it doesn't.
-* Checks out the vendor branch (chef-vendor-COOKBOOK).
-* Removes the existing (old) version.
-* Untars the cookbook tarball it downloaded in the first step.
-* Adds the cookbook files to the git index and commits.
-* Creates a tag for the version downloaded.
-* Checks out the master branch again.
-* Merges the cookbook into master.
-* Repeats the above for all the cookbooks dependencies, downloading them from the community site
-
-The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates.
-
-If you're not using Git, use the site download subcommand to download the tarball.
-
-    knife cookbook site download COOKBOOK
-
-This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
diff --git a/cookbooks/user/CHANGELOG.md b/cookbooks/aai-resources/aai-resources-auth/CHANGELOG.md
index dec3520..c58a274 100644
--- a/cookbooks/user/CHANGELOG.md
+++ b/cookbooks/aai-resources/aai-resources-auth/CHANGELOG.md
@@ -1,11 +1,11 @@
-user CHANGELOG
-==============
+ajsc-aai-auth CHANGELOG
+=======================
 
-This file is used to list changes made in each version of the user cookbook.
+This file is used to list changes made in each version of the aai-resources-auth cookbook.
 
 0.1.0
 -----
-- [your_name] - Initial release of user
+- [your_name] - Initial release of aai-resources-auth
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
diff --git a/cookbooks/ajsc-aai-auth/README.md b/cookbooks/aai-resources/aai-resources-auth/README.md
index da8fe00..b5157ab 100644
--- a/cookbooks/ajsc-aai-auth/README.md
+++ b/cookbooks/aai-resources/aai-resources-auth/README.md
@@ -1,4 +1,4 @@
-ajsc-aai-auth Cookbook
+aai-resources-auth Cookbook
 ======================
 TODO: Enter the cookbook description here.
 
@@ -36,11 +36,11 @@ e.g.
 
 Usage
 -----
-#### ajsc-aai-auth::default
+#### aai-resources-auth::default
 TODO: Write usage instructions for each cookbook.
 
 e.g.
-Just include `ajsc-aai-auth` in your node's `run_list`:
+Just include `aai-resources-auth` in your node's `run_list`:
 
 ```json
 {
diff --git a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-dev b/cookbooks/aai-resources/aai-resources-auth/files/default/aai_keystore-dev
index 3eef135..3eef135 100644
--- a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-dev
+++ b/cookbooks/aai-resources/aai-resources-auth/files/default/aai_keystore-dev
diff --git a/cookbooks/aai-resources/aai-resources-auth/metadata.rb b/cookbooks/aai-resources/aai-resources-auth/metadata.rb
new file mode 100644
index 0000000..6b940b8
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-auth/metadata.rb
@@ -0,0 +1,7 @@
+name             'aai-resources-auth'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-resources-auth'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb b/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb
new file mode 100644
index 0000000..3c55162
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb
@@ -0,0 +1,8 @@
+cookbook_file "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
+  source "aai_keystore-#{node['aai-resources-config']['AAIENV']}"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+  action :create
+end
+
diff --git a/cookbooks/ajsc-aai-config/CHANGELOG.md b/cookbooks/aai-resources/aai-resources-config/CHANGELOG.md
index ea3ec7a..8752651 100644
--- a/cookbooks/ajsc-aai-config/CHANGELOG.md
+++ b/cookbooks/aai-resources/aai-resources-config/CHANGELOG.md
@@ -1,4 +1,4 @@
-ajsc-aai-config CHANGELOG
+aai-resources-config CHANGELOG
 =========================
 
 This file is used to list changes made in each version of the ajsc-aai-config cookbook.
diff --git a/cookbooks/ajsc-aai-config/README.md b/cookbooks/aai-resources/aai-resources-config/README.md
index decd065..b71fb90 100644
--- a/cookbooks/ajsc-aai-config/README.md
+++ b/cookbooks/aai-resources/aai-resources-config/README.md
@@ -1,4 +1,4 @@
-ajsc-aai-config Cookbook
+aai-resources-config Cookbook
 ========================
 TODO: Enter the cookbook description here.
 
@@ -11,7 +11,7 @@ TODO: List your cookbook requirements. Be sure to include any requirements this
 
 e.g.
 #### packages
-- `toaster` - ajsc-aai-config needs toaster to brown your bagel.
+- `toaster` - aai-resources-config needs toaster to brown your bagel.
 
 Attributes
 ----------
diff --git a/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb b/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb
new file mode 100644
index 0000000..af27381
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb
@@ -0,0 +1,15 @@
+node.default["aai-resources-config"]["AAIENV"] = 'devINT1'
+node.default["aai-resources-config"]["PROJECT_HOME"] = '/opt/app/aai-resources'
+node.default["aai-resources-config"]["LOGROOT"] = '/opt/aai/logroot'
+node.default["aai-resources-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
+node.default["aai-resources-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
+node.default["aai-resources-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v10/'
+node.default["aai-resources-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
+node.default["aai-resources-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-resources-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-resources-config"]["AAI_KEYSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-resources-config"]["AAI_KEYSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-resources-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
+node.default["aai-resources-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
+node.default["aai-resources-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
+node.default["aai-resources-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
diff --git a/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb b/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb
new file mode 100644
index 0000000..21eb295
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb
@@ -0,0 +1 @@
+node.default["aai-resources-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb b/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb
new file mode 100644
index 0000000..103583b
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb
@@ -0,0 +1,6 @@
+node.default["aai-resources-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-resources-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
+node.default["aai-resources-config"]["DB_CACHE_CLEAN_WAIT"] = 20
+node.default["aai-resources-config"]["DB_CACHE_TIME"] = 180000
+node.default["aai-resources-config"]["DB_CACHE_SIZE"] = 0.3
\ No newline at end of file
diff --git a/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb b/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb
new file mode 100644
index 0000000..c289a63
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb
@@ -0,0 +1,3 @@
+node.default["aai-resources-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-resources-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
\ No newline at end of file
diff --git a/cookbooks/aai-resources/aai-resources-config/metadata.rb b/cookbooks/aai-resources/aai-resources-config/metadata.rb
new file mode 100644
index 0000000..d32f4cf
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/metadata.rb
@@ -0,0 +1,7 @@
+name             'aai-resources-config'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-resources-config'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb b/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb
new file mode 100644
index 0000000..b018237
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb
@@ -0,0 +1,11 @@
+['preferredRoute.txt'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/preferredRoute.txt"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-resources-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
+      )
+  end
+end
\ No newline at end of file
diff --git a/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb b/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb
new file mode 100644
index 0000000..13f34c2
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb
@@ -0,0 +1,78 @@
+################
+# Update aaiResourcesConfig.properties 
+################
+include_recipe 'aai-resources-config::createConfigDirectories'
+  
+['aaiconfig.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/aaiconfig.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_SERVER_URL_BASE => node["aai-resources-config"]["AAI_SERVER_URL_BASE"],
+:AAI_SERVER_URL => node["aai-resources-config"]["AAI_SERVER_URL"],
+:AAI_GLOBAL_CALLBACK_URL => node["aai-resources-config"]["AAI_GLOBAL_CALLBACK_URL"],
+:AAI_TRUSTSTORE_FILENAME => node["aai-resources-config"]["AAI_TRUSTSTORE_FILENAME"],
+:AAI_TRUSTSTORE_PASSWD_X => node["aai-resources-config"]["AAI_TRUSTSTORE_PASSWD_X"],
+:AAI_KEYSTORE_FILENAME => node["aai-resources-config"]["AAI_KEYSTORE_FILENAME"],
+:AAI_KEYSTORE_PASSWD_X => node["aai-resources-config"]["AAI_KEYSTORE_PASSWD_X"],
+:APPLICATION_SERVERS => node["aai-resources-config"]["APPLICATION_SERVERS"],
+:TXN_HBASE_TABLE_NAME => node["aai-resources-config"]["TXN_HBASE_TABLE_NAME"],
+:TXN_ZOOKEEPER_QUORUM => node["aai-resources-config"]["TXN_ZOOKEEPER_QUORUM"],
+:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-resources-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
+:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:RESOURCE_VERSION_ENABLE_FLAG => node["aai-resources-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
+    :AAI_NOTIFICATION_CURRENT_PACKAGE => node["aai-resources-config"]["AAI_NOTIFICATION_CURRENT_PACKAGE"],
+    :AAI_NOTIFICATION_CURRENT_VERSION => node["aai-resources-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
+:AAI_DEFAULT_API_VERSION => node["aai-resources-config"]["AAI_DEFAULT_API_VERSION"]
+      )
+  end
+end
+
+#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
+#  source "mso-asdc-controller-config"
+#  #cookbook "default is current"
+#  files_mode "0700"
+#  files_owner "jboss"
+#  files_group "jboss"
+#  mode "0755"
+#  owner "jboss"
+#  group "jboss"
+#  overwrite true
+#  recursive true
+#  action :create
+#end
+
+
+################
+# Alternative example1
+# This updates all the timestamps
+# Seting preserve never changes the timestamp when the file is changed
+######
+# ruby_block "copy_recurse" do
+#   block do
+#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
+#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
+#   end
+#   action :run
+# end
+
+################
+# Alternative example2
+######
+# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
+#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
+#     source entry
+#     owner "root"
+#     group "root"
+#     mode 0755
+#   end
+# end 
diff --git a/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb b/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb
new file mode 100644
index 0000000..e944195
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb
@@ -0,0 +1,44 @@
+# Create or update the needed directories/links.
+# If the directory already exists, it is updated to match
+# 
+# LOGROOT should already be created by the SWM installation script
+# It needs to run as root 
+
+[ 
+	"#{node['aai-resources-config']['LOGROOT']}/AAI-RES",
+  "#{node['aai-resources-config']['LOGROOT']}/AAI-RES/data",
+	"#{node['aai-resources-config']['LOGROOT']}/AAI-RES/misc",
+  "#{node['aai-resources-config']['LOGROOT']}/AAI-RES/ajsc-jetty" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0755'
+    recursive=true
+    action :create
+  end
+end
+
+[ "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0777'
+    recursive=true
+    action :create
+  end
+end
+#Application logs
+link "#{node['aai-resources-config']['PROJECT_HOME']}/logs" do
+  to "#{node['aai-resources-config']['LOGROOT']}/AAI-RES"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
+
+#Make a link from /opt/app/aai-resources/scripts to /opt/app/aai-resources/bin
+link "#{node['aai-resources-config']['PROJECT_HOME']}/scripts" do
+  to "#{node['aai-resources-config']['PROJECT_HOME']}/bin"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
diff --git a/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb b/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb
new file mode 100644
index 0000000..53ada49
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb
@@ -0,0 +1,17 @@
+['titan-cached.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/titan-cached.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-resources-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-resources-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:DB_CACHE_CLEAN_WAIT => node["aai-resources-config"]["DB_CACHE_CLEAN_WAIT"],
+:DB_CACHE_TIME => node["aai-resources-config"]["DB_CACHE_TIME"],
+:DB_CACHE_SIZE => node["aai-resources-config"]["DB_CACHE_SIZE"]
+      )
+  end
+end
+
diff --git a/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb b/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb
new file mode 100644
index 0000000..c456eb3
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb
@@ -0,0 +1,14 @@
+['titan-realtime.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/titan-realtime.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-resources-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-resources-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"]
+      )
+  end
+end
+
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiconfig.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties
index efeeb82..37e5dcd 100644
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiconfig.properties
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties
@@ -8,61 +8,24 @@ aai.config.checktime=1000
 # this could come from siteconfig.pl?
 aai.config.nodename=AutomaticallyOverwritten
 
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
 
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
 
 aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
+
 aai.server.url.base=<%= @AAI_SERVER_URL_BASE %>
 aai.server.url=<%= @AAI_SERVER_URL %>
 aai.global.callback.url=<%= @AAI_GLOBAL_CALLBACK_URL %>
+
+aai.tools.enableBasicAuth=true
+aai.tools.username=AAI
+aai.tools.password=AAI
+
 aai.truststore.filename=<%= @AAI_TRUSTSTORE_FILENAME %>
 aai.truststore.passwd.x=<%= @AAI_TRUSTSTORE_PASSWD_X %>
 aai.keystore.filename=<%= @AAI_KEYSTORE_FILENAME %>
 aai.keystore.passwd.x=<%= @AAI_KEYSTORE_PASSWD_X %>
 
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=<%= @STORAGE_BACKEND %>
-storage.hostname=<%= @STORAGE_HOSTNAME %>
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
-storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
-hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
-hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-hbase.column.ttl.days=<%= @HBASE_COLUMN_TTL_DAYS %>
-
-# single primary server
-aai.primary.filetransfer.serverlist=<%= @APPLICATION_SERVERS %>
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
 
 aai.notification.current.version=<%= @AAI_NOTIFICATION_CURRENT_VERSION %>
 aai.notificationEvent.default.status=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS %>
@@ -77,16 +40,40 @@ aai.resourceversion.enableflag=<%= @RESOURCE_VERSION_ENABLE_FLAG %>
 aai.logging.maxStackTraceEntries=10
 aai.default.api.version=<%= @AAI_DEFAULT_API_VERSION %>
 
+
+
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
+aai.model.query.resultset.maxcount=50
 aai.model.query.timeout.sec=90
  
 # Used by Data Grooming
-aai.grooming.default.max.fix=150
+aai.grooming.default.max.file=150
 aai.grooming.default.sleep.minutes=7
 
 aai.model.proc.max.levels=50
 aai.edgeTag.proc.max.levels=50
 
-aai.dmaap.workload.enableEventProcessing=<%= @AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING %>
\ No newline at end of file
+# for transaction log
+aai.logging.hbase.interceptor=true
+aai.logging.hbase.enabled=true
+aai.logging.hbase.logrequest=true
+aai.logging.hbase.logresponse=true
+
+# for gremlin server
+aai.server.rebind=g
+hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
+hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
+hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
+hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
+hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+
+aai.logging.trace.enabled=true
+aai.logging.trace.logrequest=false
+aai.logging.trace.logresponse=false
+
+
+aai.transaction.logging=true
+aai.transaction.logging.get=false
+aai.transaction.logging.post=false
+
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/preferredRoute.txt b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/preferredRoute.txt
index d09d49e..d09d49e 100644
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/preferredRoute.txt
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/preferredRoute.txt
diff --git a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
new file mode 100644
index 0000000..d6c9c2d
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = <%= @DB_CACHE_CLEAN_WAIT %>
+cache.db-cache-time = <%= @DB_CACHE_TIME %>
+cache.db-cache-size = <%= @DB_CACHE_SIZE %>
\ No newline at end of file
diff --git a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
new file mode 100644
index 0000000..2935cc1
--- /dev/null
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+#cache.db-cache-clean-wait = 20
+#cache.db-cache-time = 180000
+#cache.db-cache-size = 0.5
\ No newline at end of file
diff --git a/cookbooks/aai-resources/runlist-aai-resources.json b/cookbooks/aai-resources/runlist-aai-resources.json
new file mode 100644
index 0000000..a163f94
--- /dev/null
+++ b/cookbooks/aai-resources/runlist-aai-resources.json
@@ -0,0 +1,10 @@
+{
+  "run_list": [
+    "recipe[aai-resources-config::createConfigDirectories]",
+    "recipe[aai-resources-auth::aai-resources-aai-keystore]",
+    "recipe[aai-resources-config::aai-resources-config]",
+    "recipe[aai-resources-config::titan-cached]",
+    "recipe[aai-resources-config::titan-realtime]",
+    "recipe[aai-resources-config::aai-preferredRoute]"
+  ]
+}
diff --git a/cookbooks/aai-traversal/aai-traversal-auth/CHANGELOG.md b/cookbooks/aai-traversal/aai-traversal-auth/CHANGELOG.md
new file mode 100644
index 0000000..c86d50b
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-auth/CHANGELOG.md
@@ -0,0 +1,13 @@
+ajsc-aai-auth CHANGELOG
+=======================
+
+This file is used to list changes made in each version of the aai-traversal-auth cookbook.
+
+0.1.0
+-----
+- [your_name] - Initial release of aai-traversal-auth
+
+- - -
+Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
+
+The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
diff --git a/cookbooks/aai-traversal/aai-traversal-auth/README.md b/cookbooks/aai-traversal/aai-traversal-auth/README.md
new file mode 100644
index 0000000..370816b
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-auth/README.md
@@ -0,0 +1,68 @@
+aai-traversal-auth Cookbook
+======================
+TODO: Enter the cookbook description here.
+
+e.g.
+This cookbook makes your favorite breakfast sandwich.
+
+Requirements
+------------
+TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+
+e.g.
+#### packages
+- `toaster` - ajsc-aai-auth needs toaster to brown your bagel.
+
+Attributes
+----------
+TODO: List your cookbook attributes here.
+
+e.g.
+#### ajsc-aai-auth::default
+<table>
+  <tr>
+    <th>Key</th>
+    <th>Type</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td><tt>['ajsc-aai-auth']['bacon']</tt></td>
+    <td>Boolean</td>
+    <td>whether to include bacon</td>
+    <td><tt>true</tt></td>
+  </tr>
+</table>
+
+Usage
+-----
+#### aai-traversal-auth::default
+TODO: Write usage instructions for each cookbook.
+
+e.g.
+Just include `aai-traversal-auth` in your node's `run_list`:
+
+```json
+{
+  "name":"my_node",
+  "run_list": [
+    "recipe[ajsc-aai-auth]"
+  ]
+}
+```
+
+Contributing
+------------
+TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
+
+e.g.
+1. Fork the repository on Github
+2. Create a named feature branch (like `add_component_x`)
+3. Write your change
+4. Write tests for your change (if applicable)
+5. Run the tests, ensuring they all pass
+6. Submit a Pull Request using Github
+
+License and Authors
+-------------------
+Authors: TODO: List authors
diff --git a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int b/cookbooks/aai-traversal/aai-traversal-auth/files/default/aai_keystore-dev
index 3eef135..3eef135 100644
--- a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int
+++ b/cookbooks/aai-traversal/aai-traversal-auth/files/default/aai_keystore-dev
diff --git a/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb b/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb
new file mode 100644
index 0000000..e653749
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb
@@ -0,0 +1,7 @@
+name             'aai-traversal-auth'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-traversal-auth'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb b/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb
new file mode 100644
index 0000000..c1b3f28
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb
@@ -0,0 +1,8 @@
+cookbook_file "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
+  source "aai_keystore-#{node['aai-traversal-config']['AAIENV']}"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+  action :create
+end
+
diff --git a/cookbooks/ajsc-aai-auth/CHANGELOG.md b/cookbooks/aai-traversal/aai-traversal-config/CHANGELOG.md
index 575f2f7..1e69e21 100644
--- a/cookbooks/ajsc-aai-auth/CHANGELOG.md
+++ b/cookbooks/aai-traversal/aai-traversal-config/CHANGELOG.md
@@ -1,11 +1,11 @@
-ajsc-aai-auth CHANGELOG
-=======================
+aai-traversal-config CHANGELOG
+=========================
 
-This file is used to list changes made in each version of the ajsc-aai-auth cookbook.
+This file is used to list changes made in each version of the ajsc-aai-config cookbook.
 
 0.1.0
 -----
-- [your_name] - Initial release of ajsc-aai-auth
+- [your_name] - Initial release of ajsc-aai-config
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
diff --git a/cookbooks/aai-traversal/aai-traversal-config/README.md b/cookbooks/aai-traversal/aai-traversal-config/README.md
new file mode 100644
index 0000000..3e6fcc9
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/README.md
@@ -0,0 +1,68 @@
+aai-traversal-config Cookbook
+========================
+TODO: Enter the cookbook description here.
+
+e.g.
+This cookbook makes your favorite breakfast sandwich.
+
+Requirements
+------------
+TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+
+e.g.
+#### packages
+- `toaster` - aai-traversal-config needs toaster to brown your bagel.
+
+Attributes
+----------
+TODO: List your cookbook attributes here.
+
+e.g.
+#### ajsc-aai-config::default
+<table>
+  <tr>
+    <th>Key</th>
+    <th>Type</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td><tt>['ajsc-aai-config']['bacon']</tt></td>
+    <td>Boolean</td>
+    <td>whether to include bacon</td>
+    <td><tt>true</tt></td>
+  </tr>
+</table>
+
+Usage
+-----
+#### ajsc-aai-config::default
+TODO: Write usage instructions for each cookbook.
+
+e.g.
+Just include `ajsc-aai-config` in your node's `run_list`:
+
+```json
+{
+  "name":"my_node",
+  "run_list": [
+    "recipe[ajsc-aai-config]"
+  ]
+}
+```
+
+Contributing
+------------
+TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
+
+e.g.
+1. Fork the repository on Github
+2. Create a named feature branch (like `add_component_x`)
+3. Write your change
+4. Write tests for your change (if applicable)
+5. Run the tests, ensuring they all pass
+6. Submit a Pull Request using Github
+
+License and Authors
+-------------------
+Authors: TODO: List authors
diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb
new file mode 100644
index 0000000..72f7433
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb
@@ -0,0 +1,15 @@
+node.default["aai-traversal-config"]["AAIENV"] = 'solo'
+node.default["aai-traversal-config"]["PROJECT_HOME"] = '/opt/app/aai-traversal'
+node.default["aai-traversal-config"]["LOGROOT"] = '/opt/aai/logroot'
+node.default["aai-traversal-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
+node.default["aai-traversal-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
+node.default["aai-traversal-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v10/'
+node.default["aai-traversal-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
+node.default["aai-traversal-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-traversal-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-traversal-config"]["AAI_KEYSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-traversal-config"]["AAI_KEYSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-traversal-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
+node.default["aai-traversal-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
+node.default["aai-traversal-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
+node.default["aai-traversal-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb
new file mode 100644
index 0000000..97fa6fd
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb
@@ -0,0 +1 @@
+node.default["aai-traversal-config"]["AAI_GREMLIN_SERVER_CONFIG_HOST_LIST"] = '[localhost]'
diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/preferredRoute.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/preferredRoute.rb
new file mode 100644
index 0000000..21af672
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/preferredRoute.rb
@@ -0,0 +1 @@
+node.default["aai-traversal-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
new file mode 100644
index 0000000..cb88f3c
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
@@ -0,0 +1,6 @@
+node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
+node.default["aai-traversal-config"]["DB_CACHE_CLEAN_WAIT"] = 20
+node.default["aai-traversal-config"]["DB_CACHE_TIME"] = 180000
+node.default["aai-traversal-config"]["DB_CACHE_SIZE"] = 0.3
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
new file mode 100644
index 0000000..f67c646
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
@@ -0,0 +1,3 @@
+node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/metadata.rb b/cookbooks/aai-traversal/aai-traversal-config/metadata.rb
new file mode 100644
index 0000000..fd654fa
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/metadata.rb
@@ -0,0 +1,7 @@
+name             'aai-traversal-config'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-traversal-config'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb
new file mode 100644
index 0000000..2672e9b
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb
@@ -0,0 +1,11 @@
+['preferredRoute.txt'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/preferredRoute.txt"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-traversal-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
+      )
+  end
+end
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-traversal-config.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-traversal-config.rb
new file mode 100644
index 0000000..aae12d0
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-traversal-config.rb
@@ -0,0 +1,77 @@
+################
+# Update aaiGraphQueryConfig.properties 
+################
+include_recipe 'aai-traversal-config::createConfigDirectories'
+  
+['aaiconfig.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/aaiconfig.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_SERVER_URL_BASE => node["aai-traversal-config"]["AAI_SERVER_URL_BASE"],
+:AAI_SERVER_URL => node["aai-traversal-config"]["AAI_SERVER_URL"],
+:AAI_GLOBAL_CALLBACK_URL => node["aai-traversal-config"]["AAI_GLOBAL_CALLBACK_URL"],
+:AAI_TRUSTSTORE_FILENAME => node["aai-traversal-config"]["AAI_TRUSTSTORE_FILENAME"],
+:AAI_TRUSTSTORE_PASSWD_X => node["aai-traversal-config"]["AAI_TRUSTSTORE_PASSWD_X"],
+:AAI_KEYSTORE_FILENAME => node["aai-traversal-config"]["AAI_KEYSTORE_FILENAME"],
+:AAI_KEYSTORE_PASSWD_X => node["aai-traversal-config"]["AAI_KEYSTORE_PASSWD_X"],
+:APPLICATION_SERVERS => node["aai-traversal-config"]["APPLICATION_SERVERS"], 
+:TXN_HBASE_TABLE_NAME => node["aai-traversal-config"]["TXN_HBASE_TABLE_NAME"],
+:TXN_ZOOKEEPER_QUORUM => node["aai-traversal-config"]["TXN_ZOOKEEPER_QUORUM"],
+:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-traversal-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
+:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:RESOURCE_VERSION_ENABLE_FLAG => node["aai-traversal-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
+    :AAI_NOTIFICATION_CURRENT_VERSION => node["aai-traversal-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
+:AAI_DEFAULT_API_VERSION => node["aai-traversal-config"]["AAI_DEFAULT_API_VERSION"]
+      )
+  end
+end
+
+#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
+#  source "mso-asdc-controller-config"
+#  #cookbook "default is current"
+#  files_mode "0700"
+#  files_owner "jboss"
+#  files_group "jboss"
+#  mode "0755"
+#  owner "jboss"
+#  group "jboss"
+#  overwrite true
+#  recursive true
+#  action :create
+#end
+
+
+################
+# Alternative example1
+# This updates all the timestamps
+# Seting preserve never changes the timestamp when the file is changed
+######
+# ruby_block "copy_recurse" do
+#   block do
+#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
+#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
+#   end
+#   action :run
+# end
+
+################
+# Alternative example2
+######
+# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
+#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
+#     source entry
+#     owner "root"
+#     group "root"
+#     mode 0755
+#   end
+# end 
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb
new file mode 100644
index 0000000..9739c1a
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb
@@ -0,0 +1,44 @@
+# Create or update the needed directories/links.
+# If the directory already exists, it is updated to match
+# 
+# LOGROOT should already be created by the SWM installation script
+# It needs to run as root 
+
+[ 
+	"#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ",
+  "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/data",
+	"#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/misc",
+  "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/ajsc-jetty" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0755'
+    recursive=true
+    action :create
+  end
+end
+
+[ "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0777'
+    recursive=true
+    action :create
+  end
+end
+#Application logs
+link "#{node['aai-traversal-config']['PROJECT_HOME']}/logs" do
+  to "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
+
+#Make a link from /opt/app/aai-traversal/scripts to /opt/app/aai-traversal/bin
+link "#{node['aai-traversal-config']['PROJECT_HOME']}/scripts" do
+  to "#{node['aai-traversal-config']['PROJECT_HOME']}/bin"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb
new file mode 100644
index 0000000..2af775b
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb
@@ -0,0 +1,11 @@
+['gremlin-server-config.yaml'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/gremlin-server-config.yaml"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_GREMLIN_SERVER_CONFIG_HOST_LIST => node["aai-traversal-config"]["AAI_GREMLIN_SERVER_CONFIG_HOST_LIST"]
+      )
+  end
+end
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
new file mode 100644
index 0000000..b00e6ba
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
@@ -0,0 +1,17 @@
+['titan-cached.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/titan-cached.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-traversal-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:DB_CACHE_CLEAN_WAIT => node["aai-traversal-config"]["DB_CACHE_CLEAN_WAIT"],
+:DB_CACHE_TIME => node["aai-traversal-config"]["DB_CACHE_TIME"],
+:DB_CACHE_SIZE => node["aai-traversal-config"]["DB_CACHE_SIZE"]
+      )
+  end
+end
+
diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
new file mode 100644
index 0000000..cd6686a
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
@@ -0,0 +1,14 @@
+['titan-realtime.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/titan-realtime.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-traversal-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"]
+      )
+  end
+end
+
diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties
new file mode 100644
index 0000000..eadc72a
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties
@@ -0,0 +1,75 @@
+####################################################################
+#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
+#  TEMPLATE AND *ALL* DATAFILES
+####################################################################
+
+aai.config.checktime=1000
+
+# this could come from siteconfig.pl?
+aai.config.nodename=AutomaticallyOverwritten
+
+aai.tools.enableBasicAuth=true
+aai.tools.username=AAI
+aai.tools.password=AAI
+
+aai.auth.cspcookies_on=false
+aai.dbmodel.filename=ex5.json
+
+aai.server.url.base=<%= @AAI_SERVER_URL_BASE %>
+aai.server.url=<%= @AAI_SERVER_URL %>
+aai.global.callback.url=<%= @AAI_GLOBAL_CALLBACK_URL %>
+
+
+aai.truststore.filename=<%= @AAI_TRUSTSTORE_FILENAME %>
+aai.truststore.passwd.x=<%= @AAI_TRUSTSTORE_PASSWD_X %>
+aai.keystore.filename=<%= @AAI_KEYSTORE_FILENAME %>
+aai.keystore.passwd.x=<%= @AAI_KEYSTORE_PASSWD_X %>
+
+
+aai.notification.current.version=<%= @AAI_NOTIFICATION_CURRENT_VERSION %>
+aai.notificationEvent.default.status=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS %>
+aai.notificationEvent.default.eventType=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE %>
+aai.notificationEvent.default.domain=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN %>
+aai.notificationEvent.default.sourceName=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME %>
+aai.notificationEvent.default.sequenceNumber=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER %>
+aai.notificationEvent.default.severity=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY %>
+aai.notificationEvent.default.version=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_VERSION %>
+# This one lets us enable/disable resource-version checking on updates/deletes
+aai.resourceversion.enableflag=<%= @RESOURCE_VERSION_ENABLE_FLAG %>
+aai.logging.maxStackTraceEntries=10
+aai.default.api.version=<%= @AAI_DEFAULT_API_VERSION %>
+
+# Used by Model-processing code
+aai.model.delete.sleep.per.vtx.msec=500
+aai.model.query.resultset.maxcount=50
+aai.model.query.timeout.sec=90
+ 
+
+aai.model.proc.max.levels=50
+aai.edgeTag.proc.max.levels=50
+
+# for transaction log
+aai.logging.hbase.interceptor=true
+aai.logging.hbase.enabled=true
+aai.logging.hbase.logrequest=true
+aai.logging.hbase.logresponse=true
+
+# for gremlin server
+aai.server.rebind=g
+hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
+hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
+hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
+hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
+hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+
+
+aai.logging.trace.enabled=true
+aai.logging.trace.logrequest=false
+aai.logging.trace.logresponse=false
+
+
+aai.transaction.logging=true
+aai.transaction.logging.get=false
+aai.transaction.logging.post=false
+
+
diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml
new file mode 100644
index 0000000..23637a8
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml
@@ -0,0 +1,3 @@
+hosts: <%= @AAI_GREMLIN_SERVER_CONFIG_HOST_LIST %>
+port: 8182
+serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/preferredRoute.txt b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/preferredRoute.txt
new file mode 100644
index 0000000..d09d49e
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/preferredRoute.txt
@@ -0,0 +1 @@
+preferredRouteKey=<%= @AAI_WORKLOAD_PREFERRED_ROUTE_KEY %>
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
new file mode 100644
index 0000000..d6c9c2d
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = <%= @DB_CACHE_CLEAN_WAIT %>
+cache.db-cache-time = <%= @DB_CACHE_TIME %>
+cache.db-cache-size = <%= @DB_CACHE_SIZE %>
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
new file mode 100644
index 0000000..2935cc1
--- /dev/null
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+#cache.db-cache-clean-wait = 20
+#cache.db-cache-time = 180000
+#cache.db-cache-size = 0.5
\ No newline at end of file
diff --git a/cookbooks/aai-traversal/runlist-aai-traversal.json b/cookbooks/aai-traversal/runlist-aai-traversal.json
new file mode 100644
index 0000000..bd2fab2
--- /dev/null
+++ b/cookbooks/aai-traversal/runlist-aai-traversal.json
@@ -0,0 +1,11 @@
+{
+  "run_list": [
+    "recipe[aai-traversal-config::createConfigDirectories]",
+    "recipe[aai-traversal-auth::aai-traversal-aai-keystore]",
+    "recipe[aai-traversal-config::titan-cached]",
+    "recipe[aai-traversal-config::titan-realtime]",
+    "recipe[aai-traversal-config::gremlin-server-config]",
+    "recipe[aai-traversal-config::aai-traversal-config]",
+    "recipe[aai-traversal-config::aai-preferredRoute]"
+  ]
+}
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local b/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local
deleted file mode 100644
index 3eef135..0000000
--- a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local
+++ /dev/null
diff --git a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo b/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo
deleted file mode 100644
index 3eef135..0000000
--- a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo
+++ /dev/null
diff --git a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo b/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo
deleted file mode 100644
index 3eef135..0000000
--- a/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo
+++ /dev/null
diff --git a/cookbooks/ajsc-aai-auth/metadata.rb b/cookbooks/ajsc-aai-auth/metadata.rb
deleted file mode 100644
index 1cf7e82..0000000
--- a/cookbooks/ajsc-aai-auth/metadata.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-auth'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-auth'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
diff --git a/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb b/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb
deleted file mode 100644
index e5c0599..0000000
--- a/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-cookbook_file "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
-  source "aai_keystore-#{node['aai-app-config']['AAIENV']}"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-  action :create
-end
-
diff --git a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb b/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb
deleted file mode 100644
index bbd266a..0000000
--- a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'

-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'

-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'

-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'

-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'

-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'

-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'

-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_ID"] = 'aaiConsumerId'

-node.default["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"] = '15000'

-node.default["aai-app-config"]["AAI_WORKLOAD_LIMIT"] = '1000'
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb b/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb
deleted file mode 100644
index aeede1e..0000000
--- a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'

-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'

-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'

-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'

-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'

-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'

-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'

-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'

-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'

-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb b/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb
deleted file mode 100644
index 7fee37d..0000000
--- a/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'

-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'

-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'

-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'

-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'

-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'

-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'

-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'

-node.default["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"] = ''

-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'

-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'

-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb b/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb
deleted file mode 100644
index a6df800..0000000
--- a/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-node.default["aai-app-config"]["AAIENV"] = 'solo'
-node.default["aai-app-config"]["PROJECT_HOME"] = '/opt/app/aai'
-#CATALINA_BASE is PROJECT_HOME + /servers/aai
-node.default["aai-app-config"]["CATALINA_BASE"] = '/servers/aai'
-node.default["aai-app-config"]["LOGROOT"] = '/opt/aai/logroot'
-node.default["aai-app-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
-node.default["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"] = '8005'
-node.default["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"] = '8080'
-node.default["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"] = '8443'
-node.default["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"] = '8009'
-node.default["aai-app-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v8/'
-node.default["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o'
-node.default["aai-app-config"]["STORAGE_HOSTNAME"] = 'localhost'
-node.default["aai-app-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
-node.default["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
-node.default["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["APPLICATION_SERVERS"] = 'localhost'
-node.default["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"] = 'UNPROCESSED'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"] = 'AAI-EVENT'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"] = 'application'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"] = 'aai'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"] = '0'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"] = 'NORMAL'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"] = 'v1'
-node.default["aai-app-config"]["AAI_DEFAULT_API_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"] = 'false'
-node.default["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"] = '15'
diff --git a/cookbooks/ajsc-aai-config/attributes/logback.rb b/cookbooks/ajsc-aai-config/attributes/logback.rb
deleted file mode 100644
index 58ecdf3..0000000
--- a/cookbooks/ajsc-aai-config/attributes/logback.rb
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"] = 'INFO'
diff --git a/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb b/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb
deleted file mode 100644
index dec40c7..0000000
--- a/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/metadata.rb b/cookbooks/ajsc-aai-config/metadata.rb
deleted file mode 100644
index 26a76d5..0000000
--- a/cookbooks/ajsc-aai-config/metadata.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-config'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-config'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
diff --git a/cookbooks/ajsc-aai-config/recipes/aai-config.rb b/cookbooks/ajsc-aai-config/recipes/aai-config.rb
deleted file mode 100644
index 7cbae3a..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aai-config.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-################
-# Update aaiconfig.properties 
-######
-include_recipe 'ajsc-aai-config::createConfigDirectories'
-  
-['aaiconfig.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/#{file}"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:TOMCAT_SHUTDOWN_PORT_1 => node["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"],
-:TOMCAT_HTTP_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"],
-:TOMCAT_HTTPS_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"],
-:TOMCAT_AJP13_CONNECTOR_PORT_1 => node["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"],
-:AAI_SERVER_URL_BASE => node["aai-app-config"]["AAI_SERVER_URL_BASE"],
-:AAI_SERVER_URL => node["aai-app-config"]["AAI_SERVER_URL"],
-:AAI_OLDSERVER_URL => node["aai-app-config"]["AAI_OLDSERVER_URL"],
-:AAI_GLOBAL_CALLBACK_URL => node["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"],
-:AAI_TRUSTSTORE_FILENAME => node["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"],
-:AAI_TRUSTSTORE_PASSWD_X => node["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"],
-:AAI_KEYSTORE_FILENAME => node["aai-app-config"]["AAI_KEYSTORE_FILENAME"],
-:AAI_KEYSTORE_PASSWD_X => node["aai-app-config"]["AAI_KEYSTORE_PASSWD_X"],
-:STORAGE_HOSTNAME => node["aai-app-config"]["STORAGE_HOSTNAME"],
-:STORAGE_BACKEND => node["aai-app-config"]["STORAGE_BACKEND"],
-:STORAGE_HBASE_TABLE => node["aai-app-config"]["STORAGE_HBASE_TABLE"],
-:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:HBASE_COLUMN_TTL_DAYS => node["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"],
-:TXN_HBASE_TABLE_NAME => node["aai-app-config"]["TXN_HBASE_TABLE_NAME"],
-:TXN_ZOOKEEPER_QUORUM => node["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"],
-:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
-:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:NOTIFICATION_HBASE_TABLE_NAME => node["aai-app-config"]["NOTIFICATION_HBASE_TABLE_NAME"],
-:APPLICATION_SERVERS => node["aai-app-config"]["APPLICATION_SERVERS"],
-:AAI_NOTIFICATION_CURRENT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
-:RESOURCE_VERSION_ENABLE_FLAG => node["aai-app-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
-:AAI_DEFAULT_API_VERSION => node["aai-app-config"]["AAI_DEFAULT_API_VERSION"],
-:AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING => node["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"]
-      )
-  end
-end
-
-#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
-#  source "mso-asdc-controller-config"
-#  #cookbook "default is current"
-#  files_mode "0700"
-#  files_owner "jboss"
-#  files_group "jboss"
-#  mode "0755"
-#  owner "jboss"
-#  group "jboss"
-#  overwrite true
-#  recursive true
-#  action :create
-#end
-
-
-################
-# Alternative example1
-# This updates all the timestamps
-# Seting preserve never changes the timestamp when the file is changed
-######
-# ruby_block "copy_recurse" do
-#   block do
-#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
-#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
-#   end
-#   action :run
-# end
-
-################
-# Alternative example2
-######
-# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
-#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
-#     source entry
-#     owner "root"
-#     group "root"
-#     mode 0755
-#   end
-# end 
diff --git a/cookbooks/ajsc-aai-config/recipes/aai-logback.rb b/cookbooks/ajsc-aai-config/recipes/aai-logback.rb
deleted file mode 100644
index 505c44a..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aai-logback.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-################
-# Update logback.xml
-######
-  
-['logback.xml'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/#{file}" do
-    source "aai-app-config/logback.erb"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0777"
-    variables(
-:ORG_OPENECOMP_AAI_LEVEL => node["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"]
-      )
-  end
-end
diff --git a/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb b/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb
deleted file mode 100644
index c9f4887..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-['preferredRoute.txt'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/preferredRoute.txt"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb b/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb
deleted file mode 100644
index 676e5ce..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-['aaiWorkloadConsumer.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadConsumer.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_FILTER => node["aai-app-config"]["AAI_WORKLOAD_FILTER"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_ID => node["aai-app-config"]["AAI_WORKLOAD_ID"],
-:AAI_WORKLOAD_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"],
-:AAI_WORKLOAD_LIMIT => node["aai-app-config"]["AAI_WORKLOAD_LIMIT"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb b/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb
deleted file mode 100644
index 815f29c..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb b/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb
deleted file mode 100644
index 032737e..0000000
--- a/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadStatusPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadStatusPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"],
-:AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb b/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb
deleted file mode 100644
index eac5cd1..0000000
--- a/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# Create or update the needed directories/links.
-# If the directory already exists, it is updated to match
-# 
-# LOGROOT should already be created by the SWM installation script
-# It needs to run as root 
-
-execute "mv logs logs.bak" do
-    only_if { ::File.directory?("#{node['aai-app-config']['PROJECT_HOME']}/logs") }
-    user 'aaiadmin'
-    group 'aaiadmin'
-    cwd "#{node['aai-app-config']['PROJECT_HOME']}"
-end
-
-[ 
-	"#{node['aai-app-config']['LOGROOT']}/AAI",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/data",
-	"#{node['aai-app-config']['LOGROOT']}/AAI/misc",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/ajsc-jetty" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0755'
-    recursive=true
-    action :create
-  end
-end
-
-[ "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0777'
-    recursive=true
-    action :create
-  end
-end
-#Application logs
-link "#{node['aai-app-config']['PROJECT_HOME']}/logs" do
-  to "#{node['aai-app-config']['LOGROOT']}/AAI"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Make a link from /opt/app/aai/scripts to /opt/app/aai/bin
-link "#{node['aai-app-config']['PROJECT_HOME']}/scripts" do
-  to "#{node['aai-app-config']['PROJECT_HOME']}/bin"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Process logs??
-#ln -s ${LOGROOT}/aai/servers/${server}/logs ${TRUE_PROJECT_HOME}/servers/${server}/logs
-#link "#{node['aai-app-config']['PROJECT_HOME']}/servers/aai/logs" do
-# to "#{node['aai-app-config']['LOGROOT']}/aai/servers/aai/logs"
-#  owner 'aaiadmin'
-# group 'aaiadmin'
-#  mode '0755'
-#end
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties b/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties
deleted file mode 100644
index 81b0e30..0000000
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=GET
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-group=aaiWorkloadConsumer
-id=<%= @AAI_WORKLOAD_ID %>
-timeout=<%= @AAI_WORKLOAD_TIMEOUT %>
-limit=<%= @AAI_WORKLOAD_LIMIT %>
-filter=<%= @AAI_WORKLOAD_FILTER %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties b/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties
deleted file mode 100644
index 87a47bc..0000000
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties b/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties
deleted file mode 100644
index 73cc1c9..0000000
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties b/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties
deleted file mode 100644
index d3165d2..0000000
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-com.att.aft.discovery.client.environment=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_ENVIRONMENT %>
-com.att.aft.discovery.client.latitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LATITUDE %>
-com.att.aft.discovery.client.longitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LONGITUDE %>
-com.att.aft.alias=ecomp-aai
-com.att.aft.keyStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.keyStorePassword=<%= @COM_ATT_AFT_KEY_STORE_PASSWORD %>
-com.att.aft.trustStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.trustStorePassword=<%= @COM_ATT_AFT_TRUST_STORE_PASSWORD %>
diff --git a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb b/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb
deleted file mode 100644
index e438b89..0000000
--- a/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb
+++ /dev/null
@@ -1,298 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-	<contextName>${module.ajsc.namespace.name}</contextName>
-	<jmxConfigurator />
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>ERROR</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="METRIC"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<file>${logDirectory}/rest/metrics.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<appender-ref ref="METRIC" />
-	</appender>
-	
-	<appender name="DEBUG"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<file>${logDirectory}/rest/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<appender-ref ref="DEBUG" />
-	</appender>
-	
-	<appender name="ERROR"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<file>${logDirectory}/rest/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<appender-ref ref="ERROR" />
-	</appender>
-	
-	<appender name="AUDIT"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/rest/audit.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<appender-ref ref="AUDIT" />
-	</appender>
-	
-	<appender name="dmaapAAIWorkloadConsumer"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="dmaapAAIWorkloadConsumerdebug"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	<appender name="dmaapAAIWorkloadConsumermetric"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%m%n</pattern>
-		</encoder>
-	</appender>
-	
-	<!-- Spring related loggers -->
-	<logger name="org.springframework" level="WARN" />
-	<logger name="org.springframework.beans" level="WARN" />
-	<logger name="org.springframework.web" level="WARN" />
-	<logger name="com.blog.spring.jms" level="WARN" />
-	
-	<!-- AJSC Services (bootstrap services) -->
-	<logger name="ajsc" level="WARN" />
-	<logger name="ajsc.RouteMgmtService" level="WARN" />
-	<logger name="ajsc.ComputeService" level="WARN" />
-	<logger name="ajsc.VandelayService" level="WARN" />
-	<logger name="ajsc.FilePersistenceService" level="WARN" />
-	<logger name="ajsc.UserDefinedJarService" level="WARN" />
-	<logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-	<logger name="ajsc.LoggingConfigurationService" level="WARN" />
-	
-	<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet 	logging) -->
-	<logger name="ajsc.utils" level="WARN" />
-	<logger name="ajsc.utils.DME2Helper" level="WARN" />
-	<logger name="ajsc.filters" level="WARN" />
-	<logger name="ajsc.beans.interceptors" level="WARN" />
-	<logger name="ajsc.restlet" level="WARN" />
-	<logger name="ajsc.servlet" level="WARN" />
-	<logger name="com.att.ajsc" level="WARN" />
-	<logger name="com.att.ajsc.csi.logging" level="WARN" />
-	<logger name="com.att.ajsc.filemonitor" level="WARN" />
-	
-	<!-- Other Loggers that may help troubleshoot -->
-	<logger name="net.sf" level="WARN" />
-	<logger name="org.apache.commons.httpclient" level="WARN" />
-	<logger name="org.apache.commons" level="WARN" />
-	<logger name="org.apache.coyote" level="WARN" />
-	<logger name="org.apache.jasper" level="WARN" />
-	
-	<!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. 	May aid in troubleshooting) -->
-	<logger name="org.apache.camel" level="WARN" />
-	<logger name="org.apache.cxf" level="WARN" />
-	<logger name="org.apache.camel.processor.interceptor" level="WARN" />
-	<logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-	<logger name="org.apache.cxf.service" level="WARN" />
-	<logger name="org.restlet" level="WARN" />
-	<logger name="org.apache.camel.component.restlet" level="WARN" />
-	
-	<!-- logback internals logging -->
-	<logger name="ch.qos.logback.classic" level="WARN" />
-	<logger name="ch.qos.logback.core" level="WARN" />
-	
-	<!-- logback jms appenders & loggers definition starts here -->
-	<appender name="auditLogs"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-		<file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy	class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-		</encoder>
-	</appender>
-	<appender name="perfLogs"	class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-		<file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy	class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-		</encoder>
-	</appender>
-<!--	<if condition='property("JMS_BROKER").contains("WMQ")'>
-		<then>
-			<appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-				<param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-				<param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-				<param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-				<param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-			</appender>
-			<appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-				<param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-				<param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-				<param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-				<param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-			</appender>
-		</then>
-		<else>-->
-			<!-- logback jms appenders definition starts here -->
-<!--			<appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-				<param name="InitialContextFactoryName"	value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-				<param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-				<param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-				<param name="password" value="${JMS_LOGGER_PASSWORD}" />
-				<QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-			</appender>
-			<appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-				<param name="InitialContextFactoryName"	value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-				<param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-				<param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-				<param name="password" value="${JMS_LOGGER_PASSWORD}" />
-				<QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-			</appender>
-		</else>
-	</if> -->
-	<appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<discardingThreshold>0</discardingThreshold>
-		<appender-ref ref="Audit-Record-Queue" />
-	</appender>
-	<logger name="AuditRecord" level="INFO" additivity="false">
-		<appender-ref ref="ASYNC-audit" />
-		<appender-ref ref="auditLogs" />
-	</logger>
-	<logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-		<appender-ref ref="ASYNC-audit" />
-		<appender-ref ref="auditLogs" />
-	</logger>
-	<appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>1000</queueSize>
-		<discardingThreshold>0</discardingThreshold>
-		<appender-ref ref="Performance-Tracker-Queue" />
-	</appender>
-	<logger name="PerfTrackerRecord" level="INFO" additivity="false">
-		<appender-ref ref="ASYNC-perf" />
-		<appender-ref ref="perfLogs" />
-	</logger>
-	<!-- logback jms appenders & loggers definition ends here -->
-	
-	<logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-		<appender-ref ref="dmaapAAIWorkloadConsumer" />
-		<appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-		<appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-	</logger>
-	
-	<logger name="org.openecomp.aai" level="<%= @ORG_OPENECOMP_AAI_LEVEL %>" additivity="false">
-		<appender-ref ref="asyncDEBUG" />
-		<appender-ref ref="asyncERROR" />
-		<appender-ref ref="asyncMETRIC" />
-	</logger>
-	<logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-			<appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-	<logger name="org.apache" level="WARN" />
-	<logger name="org.zookeeper" level="WARN" />
-	<logger name="com.thinkaurelius" level="WARN" />
-	
-	<!-- ============================================================================ -->
-	<!-- General EELF logger -->
-	<!-- ============================================================================ -->
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="asyncDEBUG" />
-		<appender-ref ref="asyncERROR" />
-		<appender-ref ref="asyncMETRIC" />
-		<appender-ref ref="asyncAUDIT" />
-	</logger>
-	
-	<root level="WARN">
-		<appender-ref ref="asyncDEBUG" />
-		<appender-ref ref="asyncERROR" />
-		<appender-ref ref="asyncMETRIC" />
-		<appender-ref ref="asyncAUDIT" />
-	</root>
-</configuration>
\ No newline at end of file
diff --git a/cookbooks/runlist-app-server.json b/cookbooks/runlist-app-server.json
deleted file mode 100755
index a15ddbf..0000000
--- a/cookbooks/runlist-app-server.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "run_list": [
-    "recipe[ajsc-aai-config::aai-config]",
-    "recipe[ajsc-aai-config::aai-logback]",
-    "recipe[ajsc-aai-config::aai-preferredRoute]",
-    "recipe[ajsc-aai-config::aaiWorkloadConsumer]",
-    "recipe[ajsc-aai-config::aaiWorkloadPublisher]",
-    "recipe[ajsc-aai-config::aaiWorkloadStatusPublisher]",
-    "recipe[ajsc-aai-config::createConfigDirectories]",
-    "recipe[ajsc-aai-auth::aai-keystore]"
-  ]
-}
diff --git a/cookbooks/user/README.md b/cookbooks/user/README.md
deleted file mode 100644
index 7d85a9f..0000000
--- a/cookbooks/user/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-user Cookbook
-=============
-Configures users and mechids
-
-Requirements
-------------
-
-Attributes
-----------
-#### user::mech_users
-<table>
-  <tr>
-    <th>Key</th>
-    <th>Type</th>
-    <th>Description</th>
-    <th>Default</th>
-  </tr>
-  <tr>
-    <td><tt>['aai-app-config']['mech-ids']</tt></td>
-    <td>Hash</td>
-    <td>Mech ID, is the mech ID enabled?, shoud the cookbook update the key?</td>
-    <td><tt>true</tt></td>
-  </tr>
-</table>
-
-Usage
------
-#### user::default
-Just include `user` in your node's `run_list`:
-
-```json
-{
-  "name":"my_node",
-  "run_list": [
-    "recipe[user]"
-  ]
-}
-```
-
-License and Authors
--------------------
-Authors: AT&T A&AI
diff --git a/cookbooks/user/metadata.rb b/cookbooks/user/metadata.rb
deleted file mode 100644
index 9a97b5f..0000000
--- a/cookbooks/user/metadata.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'user'
-maintainer       'AT&T'
-maintainer_email 'id@xxx.com'
-license          'All rights reserved'
-description      'Configures Users and Mech Ids'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.9'
diff --git a/cookbooks/user/recipes/default.rb b/cookbooks/user/recipes/default.rb
deleted file mode 100644
index 20c5ac3..0000000
--- a/cookbooks/user/recipes/default.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Cookbook Name:: user
-# Recipe:: default
-#
-# Copyright 2015, AT&T
-#
-# All rights reserved - Do Not Redistribute
-#
-group 'aaiadmin' do
-  append                     true
-#gid                        492381
-  members                   members ['aaiadmin']
-  action                    :create
-end
-
-user 'aaiadmin' do
-  comment                    "A&AI Application User"
-  gid                        "aaiadmin"
-  home                       "/opt/aaihome/aaiadmin"
-  manage_home                true
-  non_unique                 false
-  shell                      "/bin/ksh"
-#uid                        341790
-  username                   "aaiadmin"
-  ignore_failure             true 
-  action                     :create
-end
-directory "/opt/aaihome/aaiadmin" do 
-  owner 'aaiadmin'
-  group 'aaiadmin'
-	mode		"0755"
-	ignore_failure	true
-end