summaryrefslogtreecommitdiffstats
path: root/docker/docker_tools/chef-solo
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2019-09-05 17:50:23 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-09-06 09:11:47 +0000
commit176a760ebe4293c19eeb96cf88269215fce870a9 (patch)
treec559a1f2bafbf6147612b88a46a0299a579af57f /docker/docker_tools/chef-solo
parent64636c2148414c1fa5da4b46a69570cdab003837 (diff)
Fully HTTPS support in the dcaedt-tools
Fully HTTPS support: -Updated the onap/base_sdc-jetty docker image version -Updated the chef script to properly used of the new docker image -Updated jvm configuration to support call to the SDC components using HTTPS. -Added buildRestClient method to create the DcaeRestClient supporting the SSL connection -Checkstyle in the recipes adn tools.Main method -Update the docker_run.sh: - Change JAVA_OPTIONS -Update docker_run script -Add proper dependency in the pom (waiting for solving the SDC-2554 bug) Issue-ID: SDC-2552 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Ie8dd1f54619f1101c13de13ae3cbb296bba57210
Diffstat (limited to 'docker/docker_tools/chef-solo')
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.gitignore20
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.kitchen.yml16
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/README.md4
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb7
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json250
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/metadata.rb7
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_tools_setup.rb47
-rw-r--r--docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb12
8 files changed, 0 insertions, 363 deletions
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.gitignore b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.gitignore
deleted file mode 100644
index b31c0d3..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-.vagrant
-Berksfile.lock
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-.kitchen/
-.kitchen.local.yml
-
-######### Private
-run.me
-DCAE-CI01.json
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.kitchen.yml b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.kitchen.yml
deleted file mode 100644
index 37d2844..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/.kitchen.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-driver:
- name: vagrant
-
-provisioner:
- name: chef_zero
-
-platforms:
- - name: ubuntu-16.04
- - name: centos-7.1
-
-suites:
- - name: default
- run_list:
- - recipe[Deploy-DCAE::default]
- attributes:
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/README.md b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/README.md
deleted file mode 100644
index 27aba53..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Deploy-DCAE
-
-TODO: Enter the cookbook description here.
-
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb
deleted file mode 100644
index b774969..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-default['WORKSPACE_DIR'] = "/var/opt/dcae-tools/app"
-
-default['DCAE']['BE'][:http_port] = 8082
-default['DCAE']['BE'][:https_port] = 8444
-
-default['disableHttp'] = true
-
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json
deleted file mode 100644
index 202ee54..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json
+++ /dev/null
@@ -1,250 +0,0 @@
-
-{
- "templateInfo": [{
- "name": "Syslog Collector",
- "flowType": "Syslog Collector",
- "description": "Syslog Collector",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "SyslogCollector",
- "alias": ""
- }]
- },{
- "name": "Syslog MSEA",
- "flowType": "Syslog MSEA",
- "description": "Syslog MSEA",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Map",
- "alias": ""
- }, {
- "type": "Supplement",
- "alias": ""
- }, {
- "type": "Enrich",
- "alias": ""
- }, {
- "type": "Alert",
- "alias": ""
- }],
- "relations": [{
- "fromComponent": "Supplement",
- "fromRequirement": "dependency",
- "toComponent": "Map",
- "toCapability": "feature"
- },{
- "fromComponent": "Enrich",
- "fromRequirement": "dependency",
- "toComponent": "Supplement",
- "toCapability": "feature"
- },{
- "fromComponent": "Alert",
- "fromRequirement": "dependency",
- "toComponent": "Enrich",
- "toCapability": "feature"
- }]
- },
-
- {
- "name": "Status Poller MSE",
- "flowType": "Status Poller MSE",
- "description": "Status Poller MSE",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Map",
- "alias": ""
- }, {
- "type": "Supplement",
- "alias": ""
- }, {
- "type": "Enrich",
- "alias": ""
- }],
- "relations": [{
- "fromComponent": "Supplement",
- "fromRequirement": "dependency",
- "toComponent": "Map",
- "toCapability": "feature"
- },{
- "fromComponent": "Enrich",
- "fromRequirement": "dependency",
- "toComponent": "Supplement",
- "toCapability": "feature"
- }]
- }, {
- "name": "FOI Collector",
- "flowType": "FOI Collector",
- "description": "FOI Collector",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "FOICollector",
- "alias": ""
- }]
-
- }, {
- "name": "SNMP MSE",
- "flowType": "SNMP MSE",
- "description": "SNMP MSE",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Map",
- "alias": ""
- }, {
- "type": "Supplement",
- "alias": ""
- }, {
- "type": "Enrich",
- "alias": ""
- }],
- "relations": [{
- "fromComponent": "Supplement",
- "fromRequirement": "dependency",
- "toComponent": "Map",
- "toCapability": "feature"
- },{
- "fromComponent": "Enrich",
- "fromRequirement": "dependency",
- "toComponent": "Supplement",
- "toCapability": "feature"
- }]
- }, {
- "name": "Docker Map",
- "flowType": "Docker Map",
- "description": "Docker Map",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "DockerMap",
- "alias": ""
- }]
- },
- {
- "name": "SAM Collector",
- "flowType": "SAM Collector",
- "description": "SAM Collector",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "SAMCollector1806",
- "alias": ""
- }]
- },
- {
- "name": "SNMP PM Poller",
- "flowType": "SNMP PM Poller",
- "description": "SNMP PM Poller",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "PM Poller",
- "alias": ""
- }]
- },
- {
- "name": "Status Poller Collector",
- "flowType": "Status Poller Collector",
- "description": "Status Poller Collector",
- "category": "Template",
- "subCategory": "Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [
- {
- "type": "StatusPoller",
- "alias": ""
- }]
- },
- {
- "name": "VES Collector",
- "flowType": "VES Collector",
- "description": "VES Collector",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "VES Collector",
- "alias": ""
- }]
- },
- {
- "name": "VES Fault SE",
- "flowType": "VES Fault SE",
- "description": "VES Fault SE",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Supplement",
- "alias": ""
- }, {
- "type": "Enrich",
- "alias": ""
- }],
- "relations": [{
- "fromComponent": "Enrich",
- "fromRequirement": "dependency",
- "toComponent": "Supplement",
- "toCapability": "feature"
- }]
- },
- {
- "name": "Docker Supplement",
- "flowType": "Docker Supplement",
- "description": "Docker Supplement",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Docker_Supplement",
- "alias": ""
- }]
- },
- {
- "name": "Docker Enrich",
- "flowType": "Docker Enrich",
- "description": "Docker Enrich",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "DockerEnrich",
- "alias": ""
- }]
- },
- {
- "name": "MIB Poller",
- "flowType": "MIB Poller",
- "description": "MIB Poller",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "MIBPoller",
- "alias": ""
- }]
- },
- {
- "name": "Discovery Poller",
- "flowType": "Discovery Poller",
- "description": "Discovery Poller",
- "category": "Template",
- "subCategory":"Base Monitoring Template",
- "updateIfExist": "false",
- "composition": [{
- "type": "Discovery",
- "alias": ""
- }]
- }]
-} \ No newline at end of file
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/metadata.rb b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/metadata.rb
deleted file mode 100644
index 7935c22..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/metadata.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-name 'Deploy-DCAE'
-maintainer 'The Authors'
-maintainer_email 'you@example.com'
-license 'all_rights'
-description 'Installs/Configures Deploy-DCAE'
-long_description 'Installs/Configures Deploy-DCAE'
-version '1.0.0'
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_tools_setup.rb b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_tools_setup.rb
deleted file mode 100644
index 152def2..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_tools_setup.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-workspace_dir = "#{node['WORKSPACE_DIR']}"
-
-dcae_be_host = node['DCAE_BE_VIP']
-
-if node['disableHttp']
- protocol = "https"
- dcae_be_port = node['DCAE']['BE'][:https_port]
-else
- protocol = "http"
- dcae_be_port = node['DCAE']['BE'][:http_port]
-end
-
-printf("DEBUG: [%s]:[%s] disableHttp=[%s], protocol=[%s], dcae_be_vip=[%s], dcae_be_port=[%s] !!! \n", cookbook_name, recipe_name, node['disableHttp'], protocol, dcae_be_host ,dcae_be_port )
-
-
-directory "#{workspace_dir}/conf" do
- mode '0755'
- owner "dcae"
- group "dcae"
- recursive true
- action :create
-end
-
-
-template "dcae-tools-config-yaml" do
- sensitive true
- path "/#{workspace_dir}/conf/environment.json"
- source "environment.json.erb"
- mode "0755"
- owner "dcae"
- group "dcae"
- variables ({
- :dcae_be_host => dcae_be_host,
- :dcae_be_port => dcae_be_port,
- :protocol => protocol
- })
-end
-
-
-cookbook_file "/#{workspace_dir}/conf/config.json" do
- sensitive true
- source "config.json"
- owner "dcae"
- group "dcae"
- mode "0755"
- action :create
-end
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb
deleted file mode 100644
index d30881c..0000000
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "dcaeBeHost": "<%= @protocol %>://<%= @dcae_be_host %>",
- "dcaeBePort": "<%= @dcae_be_port %>",
- "apiPath": "/dcae",
- "credential" :{
- "editor": "",
- "username": "jh0003",
- "password": "",
- "firstName": "",
- "lastName": ""
- }
-} \ No newline at end of file