openstack
/
openstack-chef-repo
Code Issues Proposed changes

Sync stackforge/cookbook* to openstack/cookbook* for repo cookbook 

Change-Id: I372b911cf670820cf295fe17f1c6ccc84ff79743
Partial-Bug: #1465116
This commit is contained in:
Mark Vanderwiel 2015-06-15 09:03:51 -05:00
parent f6d674524a
commit 5eaa851302
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Berksfile
View File

@ -7,10 +7,10 @@ source 'https://supermarket.chef.io'
if ENV['REPO_DEV'] && Dir.exist?("../cookbook-openstack-#{cookbook}")
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
else
cookbook "openstack-#{cookbook}", github: "stackforge/cookbook-openstack-#{cookbook}", branch: 'master'
cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}", branch: 'master'
end
end
cookbook "openstack_client", github: "stackforge/cookbook-openstack-client", branch: 'master'
cookbook "openstack_client", github: "openstack/cookbook-openstack-client", branch: 'master'
cookbook 'apache2', '3.0.0'
cookbook 'apt', '2.6.1'

2
README.md
View File

@ -17,7 +17,7 @@ Support for CentOS 6.5 and Ubuntu 12.04 with Icehouse is available with the stab
## Initial Setup Steps
```shell
$ git clone https://github.com/stackforge/openstack-chef-repo.git
$ git clone https://github.com/openstack/openstack-chef-repo.git
$ cd openstack-chef-repo
$ chef exec rake berks_vendor
```

4
bootstrap.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash -x
## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
## It relies on the common bootstrap.sh from stackforge/cookbook-openstack-common for installing common dependencies.
## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
curl https://raw.githubusercontent.com/stackforge/cookbook-openstack-common/master/bootstrap.sh \
curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
--retry 3 \
--silent \
--show-error \

8
tools/test_patch.rb
View File

@ -48,7 +48,7 @@ def get_patch_info(user, patch) # rubocop:disable Metrics/MethodLength
else
patch_info = run("ssh -p 29418 #{user}@review.openstack.org gerrit query --current-patch-set #{patch}", false)
end
/^\s*project: stackforge\/(?<patch_project>.*)$/i =~ patch_info
/^\s*project: openstack\/(?<patch_project>.*)$/i =~ patch_info
/^\s*ref: (?<patch_ref>.*)$/i =~ patch_info
abort "Error! Patch: #{patch} not valid" if patch_project.nil?
patch_cookbook = patch_project.gsub('cookbook-', '')
@ -61,9 +61,9 @@ end
def add_patch(patch_info)
puts "## Adding patch: #{patch_info[:patch]} to cookbook: #{patch_info[:cookbook]}"
run("git clone --depth 1 git@github.com:stackforge/#{patch_info[:project]}.git")
run("git clone --depth 1 git@github.com:openstack/#{patch_info[:project]}.git")
Dir.chdir(patch_info[:project]) do
run("git fetch https://review.openstack.org/stackforge/#{patch_info[:project]} #{patch_info[:ref]}")
run("git fetch https://review.openstack.org/openstack/#{patch_info[:project]} #{patch_info[:ref]}")
run('git checkout FETCH_HEAD')
end
end
@ -167,7 +167,7 @@ LONGDESC
end
end
run('git clone --depth 1 git@github.com:stackforge/openstack-chef-repo.git') unless options[:skip]
run('git clone --depth 1 git@github.com:openstack/openstack-chef-repo.git') unless options[:skip]
Dir.chdir('openstack-chef-repo') do
ENV['REPO_DEV'] = options[:patches]
run('chef exec rake berks_vendor') unless options[:skip]