summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Gitelman <tal.gitelman@att.com>2019-04-04 19:27:24 +0300
committerTal Gitelman <tal.gitelman@att.com>2019-04-04 19:27:24 +0300
commit71b5dc0a3b445c64f1b6144c3f086128d88e4902 (patch)
tree6b5a29c4b23af8f07a3769fe22b386d9ba3ec55b
parentc4d387d216e72911f80c1ebee91b73aba191b91b (diff)
Make Cassandra port configurable add defaults.
SDC-BE & Onboarding - BE. Reviewer: Evgenia A & Areli F. Change-Id: I4f11e354619a3f5cc276c128149a34f72c4b21bd Issue-ID: SDC-2077 Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
-rw-r--r--.gitignore9
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js2
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb2
3 files changed, 4 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index dde14239eb..0d31763c52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,11 +188,6 @@ catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-er
catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml
catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-*.zip
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/sdctool.tar
-sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/*
-sdc-os-chef/sdc-normatives/chef-repo/cookbooks/sdc-normatives/files/default/normatives.tar.gz
test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/testSuites/*
ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/testSuites/*
@@ -239,9 +234,6 @@ automationDownloadDir*/
*.xls
-
-/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
-
/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default/*
/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/vsp_*
@@ -278,3 +270,4 @@ asdctool/test-output/*
asdctool/report_delete_1538046694389.json
asdctool/report_test_1538046722484.json
+
diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js
index a3c1a8af6c..bbf45338f5 100644
--- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js
+++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js
@@ -33,7 +33,7 @@ export const mapStateToProps = ({
let { versions = [], selectedVersion } = versionsList;
let { owner, contributors, viewers } = permissions;
- versions.sort((a, b) => Number(a.name) > Number(b.name));
+ versions.sort((a, b) => Number(a.name) - Number(b.name));
const curentSoftwareProduct = softwareProductList.find(
item => item.id === itemId
);
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
new file mode 100644
index 0000000000..0fef120430
--- /dev/null
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
@@ -0,0 +1,2 @@
+#Cassandra
+default['cassandra']['cassandra_port'] = 9042 \ No newline at end of file