Browse Source

refactor: removes most of FX specific stuff

tags/0.1.1
Guillaume Donval 3 years ago
parent
commit
ecf81de445
Signed by: guillaume.donval <guillaume.donval@fxinnovation.com> GPG Key ID: 172AC3F9180CD64E
5 changed files with 11 additions and 26 deletions
  1. +0
    -9
      Berksfile
  2. +1
    -4
      Jenkinsfile
  3. +0
    -3
      attributes/default.rb
  4. +4
    -6
      metadata.rb
  5. +6
    -4
      recipes/kitchen.rb

+ 0
- 9
Berksfile View File

@@ -2,12 +2,3 @@
source 'https://supermarket.chef.io'

metadata

cookbook 'ff_adjoin_linux', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_adjoin_linux.git'
cookbook 'ff_yum', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_yum.git'
cookbook 'ff_linux_base', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_linux_base.git'
cookbook 'ff_ca', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_ca.git'
cookbook 'ff_telegraf', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_telegraf.git'
cookbook 'ff_ntp', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_ntp.git'
cookbook 'ff_rsyslog', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_rsyslog.git'
cookbook 'ff_rhel7_hardening', git: 'git@bitbucket.org:fxadmin/fairstone-migration-cookbook-ff_rhel7_hardening.git'

+ 1
- 4
Jenkinsfile View File

@@ -1,4 +1 @@
fairstone_cookbook{
junit_report = 'junit_*.xml'
force_run_test = true
}
fx_cookbook()

+ 0
- 3
attributes/default.rb View File

@@ -1,3 +0,0 @@
default['java']['jdk_version'] = '8'

default['fx_oracle_client']['dependencies'] = %w(gcc-c++ gcc compat-libstdc++-33 compat-libstdc++-33.i686 glibc glibc.i686 unixODBC unixODBC.i686 elfutils-libelf-devel libstdc++ libaio-devel unixODBC-devel sysstat)

+ 4
- 6
metadata.rb View File

@@ -2,14 +2,12 @@ name 'oracle_client_fx'
maintainer 'FX Innovation'
maintainer_email 'cloudsquad@fxinnovation.com'
license 'All Rights Reserved'
description 'Installs/Configures public-common-cookbook-oracle_client_fx'
long_description 'Installs/Configures public-common-cookbook-oracle_client_fx'
description 'Installs/Configures oracle client.'
long_description 'Installs/Configures oracle client.'
supports 'redhat'
version '0.1.0'
chef_version '>= 12.24' if respond_to?(:chef_version)
issues_url 'https://fxinnovation.jira.com/projects/FM/summary'
source_url 'https://bitbucket.org/fxadmin/public-common-cookbook-oracle_client_fx/src/master/'
source_url 'https://bitbucket.org/fxadmin/public-common-cookbook-oracle_client_fx/'
issues_url 'https://bitbucket.org/fxadmin/public-common-cookbook-oracle_client_fx/issues/'
depends 'java', '~> 1.50.0'
depends 'ff_linux_base'
depends 'ff_yum'
depends 'unzip_fx'

+ 6
- 4
recipes/kitchen.rb View File

@@ -1,7 +1,3 @@
#base_init 'default' do
# action :build
#end

#
# cookbook::oracle_client_fx
# recipe::default
@@ -11,5 +7,11 @@
#

oracle_client_fx 'kitchen' do
java_version node['java']['jdk_version']
version node['oracle_client_fx']['version']
installer_url node['oracle_client_fx']['installer_url']
sqlnet_options node['oracle_client_fx']['sqlnet_options']
tnsnames_options node['oracle_client_fx']['tnsnames_options']
tls_certificate_url node['oracle_client_fx']['tls_certificate_url']
action :build
end

Loading…
Cancel
Save