Fix aai resources recipe where at symbol missing

And also update the traversal recipe to be
in sync and it seems there was a typo
and the @ symbol ended up being missed

Issue-ID: AAI-548
Change-Id: Id2ec36dde0b6d38e5e2ce02a90cb8d69a75f9ffc
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

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
index ac6520a..2691adf 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
-storage.backend=<%= STORAGE_BACKEND %>
+storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none
 storage.lock.wait-time=300

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
index 9894849..b8c6168 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
-storage.backend=<%= STORAGE_BACKEND %>
+storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none
 storage.lock.wait-time=300

diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
index cb88f3c..8569998 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
@@ -1,6 +1,7 @@
 node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_BACKEND"] = 'hbase'
 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
+node.default["aai-traversal-config"]["DB_CACHE_SIZE"] = 0.3

diff --git a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
index f67c646..8d2834b 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
+++ b/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
@@ -1,3 +1,4 @@
 node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_BACKEND"] = 'hbase'
 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
+node.default["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'

diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
index b00e6ba..8a08b0d 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
@@ -6,6 +6,7 @@
     mode "0644"
     variables(
 :STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_BACKEND => node["aai-traversal-config"]["STORAGE_BACKEND"],
 :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"],

diff --git a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
index cd6686a..e45cf4c 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
+++ b/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
@@ -6,6 +6,7 @@
     mode "0644"
     variables(
 :STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_BACKEND => node["aai-traversal-config"]["STORAGE_BACKEND"],
 :STORAGE_HBASE_TABLE => node["aai-traversal-config"]["STORAGE_HBASE_TABLE"],
 :STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"]
       )

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
index d6c9c2d..2691adf 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
-storage.backend=hbase
+storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none
 storage.lock.wait-time=300
@@ -10,4 +10,4 @@ storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARE
 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
+cache.db-cache-size = <%= @DB_CACHE_SIZE %>

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
index 2935cc1..b8c6168 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
-storage.backend=hbase
+storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none
 storage.lock.wait-time=300
@@ -10,4 +10,4 @@ storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARE
 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
+#cache.db-cache-size = 0.5