From 46afa0ed92817c3607b8c89f5425149a6e6a2b98 Mon Sep 17 00:00:00 2001 From: wenchma Date: Mon, 15 Jun 2015 15:16:10 +0800 Subject: [PATCH] Sync stackforge/cookbook* to openstack/cookbook* for cinder cookbook Change-Id: Id9634912eca8611ce699d6ce73bc2e0b0a00ef9d Partial-Bug: #1465116 --- Berksfile | 6 +++--- README.md | 2 +- TESTING.md | 2 +- bootstrap.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Berksfile b/Berksfile index c323835..a4fb383 100644 --- a/Berksfile +++ b/Berksfile @@ -3,8 +3,8 @@ source "https://supermarket.chef.io" metadata cookbook "openstack-image", - github: "stackforge/cookbook-openstack-image" + github: "openstack/cookbook-openstack-image" cookbook "openstack-identity", - github: "stackforge/cookbook-openstack-identity" + github: "openstack/cookbook-openstack-identity" cookbook "openstack-common", - github: "stackforge/cookbook-openstack-common" + github: "openstack/cookbook-openstack-common" diff --git a/README.md b/README.md index 4126f91..9dd4338 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Description =========== -Installs the OpenStack Block Storage service **Cinder** as part of the OpenStack reference deployment Chef for OpenStack. The https://github.com/stackforge/openstack-chef-repo contains documentation for using this cookbook in the context of a full OpenStack deployment. Cinder is currently installed from packages. +Installs the OpenStack Block Storage service **Cinder** as part of the OpenStack reference deployment Chef for OpenStack. The https://github.com/openstack/openstack-chef-repo contains documentation for using this cookbook in the context of a full OpenStack deployment. Cinder is currently installed from packages. http://cinder.openstack.org diff --git a/TESTING.md b/TESTING.md index d9a964d..1dd45c5 100644 --- a/TESTING.md +++ b/TESTING.md @@ -1,6 +1,6 @@ # Testing the Cookbook # -This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/stackforge/openstack-chef-repo). +This cookbook uses [chefdk](https://downloads.chef.io/chef-dk/) and [berkshelf](http://berkshelf.com/) to isolate dependencies. Make sure you have chefdk and the header files for `gecode` installed before continuing. Make sure that you're using gecode version 3. More info [here](https://github.com/opscode/dep-selector-libgecode/tree/0bad63fea305ede624c58506423ced697dd2545e#using-a-system-gecode-instead). For more detailed information on what needs to be installed, you can have a quick look into the bootstrap.sh file in this repository, which does install all the needed things to get going on ubuntu trusty. The tests defined in the Rakefile include lint, style and unit. For integration testing please refere to the [openstack-chef-repo](https://github.com/openstack/openstack-chef-repo). We have three test suites which you can run either, individually (there are three rake tasks): diff --git a/bootstrap.sh b/bootstrap.sh index f38a960..fe49ef2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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 \