openstack
/
openstack-chef
Code Issues Proposed changes

remove cookbooks from chef-repo that were not refactored and are not supported 

anymore

* minor style fixes to pass rubocop (chefdk was bumped in another commit in
  common)

Change-Id: Id8de7ca218a98019f6d3f494c88deb774a23bb90
This commit is contained in:
Jan Klare 2016-08-29 08:26:09 +02:00
parent 4b51993150
commit 546d4289bc
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Berksfile
View File

@ -1,11 +1,7 @@
source 'https://supermarket.chef.io' source 'https://supermarket.chef.io'
%w( %w(
bare-metal
database
data-processing
integration-test integration-test
object-storage
orchestration orchestration
telemetry telemetry
block-storage block-storage

10
site-cookbooks/provisioning/recipes/allinone.rb
View File

@ -7,11 +7,11 @@ default_bridge += '"en0: Wi-Fi (AirPort)","en1: Wi-Fi (AirPort)",'
default_bridge += '"en2: Wi-Fi (AirPort)",' default_bridge += '"en2: Wi-Fi (AirPort)",'
default_bridge += '"Intel(R) Centrino(R) Advanced-N 6205"]' default_bridge += '"Intel(R) Centrino(R) Advanced-N 6205"]'
if ENV['OS_BRIDGE'] bridge = if ENV['OS_BRIDGE']
bridge = "\"#{ENV['OS_BRIDGE']}\"" "\"#{ENV['OS_BRIDGE']}\""
else else
bridge = default_bridge default_bridge
end end
controller_config = <<-ENDCONFIG controller_config = <<-ENDCONFIG
config.vm.network "forwarded_port", guest: 443, host: 9443 config.vm.network "forwarded_port", guest: 443, host: 9443

2
tools/test_patch.rb
View File

@ -43,7 +43,7 @@ end
def get_patch_info(user, patch) # rubocop:disable Metrics/MethodLength def get_patch_info(user, patch) # rubocop:disable Metrics/MethodLength
puts "## Gathering information for patch: #{patch} with user: #{user}" puts "## Gathering information for patch: #{patch} with user: #{user}"
if "#{user}" == 'jenkins' if user == 'jenkins'
patch_info = run("ssh -p 29418 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false) patch_info = run("ssh -p 29418 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false)
else else
patch_info = run("ssh -p 29418 #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false) patch_info = run("ssh -p 29418 #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false)