[SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>

5 files changed, 12 insertions, 9 deletions

diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index 128387ae14..e43a156d47 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetty:9.3.15-jre8
+FROM jetty:9.3-jre8
 
 RUN apt-get -y update
 RUN apt-get -y install apt-utils
@@ -16,12 +16,10 @@ RUN pip install pycurl
 # install chef-solo
 RUN curl -L https://omnitruck.chef.io/install.sh | bash
 
-ADD onboarding-be-__SDC-RELEASE__.war          ${JETTY_BASE}/webapps/
-ADD catalog-be-__SDC-RELEASE__.war             ${JETTY_BASE}/webapps/
+ADD onboarding-be-*.war                        ${JETTY_BASE}/webapps/
+ADD catalog-be-*.war                           ${JETTY_BASE}/webapps/
 RUN chown -R jetty:jetty                       ${JETTY_BASE}/webapps
 
 COPY startup.sh /root/
-
 RUN chmod 770 /root/startup.sh
-
 ENTRYPOINT [ "/root/startup.sh" ]
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
index 4287ca8617..f011a51021 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
@@ -1 +1,3 @@
-#
\ No newline at end of file
+# 
+# Example to value after replacement : default['asdctool'][:version] = "1707.0.66.73.1"
+default['asdctool'][:version] = "__CATALOG-ASDCTOOL_TAR_NAME__"
\ No newline at end of file
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb
index 4facd4247c..2c4a786d34 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb
@@ -10,8 +10,8 @@ template "titan.properties" do
       :CASSANDRA_IP => node['Nodes']['CS'],
       :CASSANDRA_PWD => node['cassandra'][:cassandra_password],
       :CASSANDRA_USR => node['cassandra'][:cassandra_user],
-      :DC_NAME => "DC-"+node.chef_environment,
-	  :rep_factor => replication_factor	 
+      :rep_factor => replication_factor,
+      :DC_NAME      => node['cassandra'][:cluster_name]+node.chef_environment
    })
 end
 
@@ -28,7 +28,7 @@ template "catalog-be-config" do
       :ssl_port     => node['BE'][:https_port],
       :cassandra_ip => node['Nodes']['CS'],
       :rep_factor   => 1,
-      :DC_NAME      => "DC-"+node.chef_environment
+      :DC_NAME      => node['cassandra'][:cluster_name]+node.chef_environment
    })
 end
 
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index c12c1b4ff6..97732908c4 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -22,6 +22,8 @@ beProtocol: http
 beSslPort: <%= @ssl_port %>
 version: 1.0
 released: 2012-11-30
+toscaConformanceLevel: 3.0
+minToscaConformanceLevel: 3.0
 
 titanCfgFile: /var/lib/jetty/config/catalog-be/titan.properties
 titanInMemoryGraph: false
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
index 27386d47ef..a42c7bf206 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb
@@ -4,6 +4,7 @@ storage.port=9160
 storage.username=<%= @CASSANDRA_USR %>
 storage.password=<%= @CASSANDRA_PWD %>
 storage.connection-timeout=10000
+storage.cassandra.keyspace=sdctitan
 
 storage.cassandra.ssl.enabled=false
 storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore