Skip to content

Commit

Permalink
Merge pull request #55 from omniti-labs/cleaning
Browse files Browse the repository at this point in the history
tidying up a bit
  • Loading branch information
clintoncwolfe committed Mar 4, 2016
2 parents 470fc7d + 1fa3ee6 commit 55d2929
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
4 changes: 1 addition & 3 deletions omnibus-ansible-dk/.kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,5 @@ suites:
- ansible-dk-builder::default # Executes the build
attributes:
omnibus:
build_user: vagrant
build_user_group: vagrant
build_user_password: vagrant
install_dir: /opt/ansible-dk
project_repo: /var/cache/omnibus-project
3 changes: 3 additions & 0 deletions omnibus-ansible-dk/omnibus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@
# ------------------------------
windows_arch %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase) ?
ENV['OMNIBUS_WINDOWS_ARCH'].downcase.to_sym : :x86

append_timestamp false

10 changes: 5 additions & 5 deletions omnibus-ansible-dk/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Use the omnibus-build resource to build the project

directory '/var/cache/omnibus-project' do
directory node[:omnibus][:project_repo] do
owner node[:omnibus][:build_user]
end

git '/var/cache/omnibus-project' do
git node[:omnibus][:project_repo] do
repository 'https://github.com/omniti-labs/ansible-dk.git'
action :sync
user node[:omnibus][:build_user]
end

link '/var/cache/omnibus-project/omnibus-ansible-dk/.gitconfig' do
link "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/.gitconfig" do
to "/home/#{node[:omnibus][:build_user]}/.gitconfig"
end

file '/var/cache/omnibus-project/omnibus-ansible-dk/Gemfile.lock' do
file "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/Gemfile.lock" do
action :delete
end

omnibus_build 'ansible-dk' do
project_dir '/var/cache/omnibus-project/omnibus-ansible-dk'
project_dir "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk"
config_overrides({dummy: 'value' })
end

0 comments on commit 55d2929

Please sign in to comment.