Removed the db recipe

The db recipe have been removed. It is up to the operator to
setup the database, users, and grants before deploying openstack.
It has been moved to the `openstack-db` recipe in the
`openstack-ops-database` wrapper cookbook.  Also, remove database
from Berksfile, and pointed berksfile to metadata, like our other
cookbooks.

Change-Id: I79ec1639e950c0016552efe98c1381257c7ab5eb
This commit is contained in:
John Dewey 2013-06-27 14:48:01 -07:00
parent c185ab284d
commit 11af293c06
4 changed files with 1 additions and 46 deletions

View File

@ -1,8 +1,4 @@
site :opscode
metadata
cookbook 'openstack-network', :path => '.'
cookbook 'apt', :git => 'https://github.com/opscode-cookbooks/apt.git'
cookbook 'openstack-identity', :git => 'https://github.com/stackforge/cookbook-openstack-identity.git'
cookbook 'openstack-common', :git => 'https://github.com/att-cloud/cookbook-openstack-common.git'
cookbook 'database'
cookbook 'mysql'

View File

@ -23,9 +23,7 @@ Cookbooks
The following cookbooks are dependencies:
* database
* identity
* mysql or postgresql
* openstack-common `>= 2.0.0`
Recipes
@ -51,11 +49,6 @@ Identity-registration
- Registers the OpenStack Network API endpoint and service user with Keystone
db
--
- Creates the OpenStack Network database
Attributes
==========

View File

@ -5,14 +5,12 @@ description "Installs and configures the OpenStack Network API Service and
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "7.0.0"
recipe "openstack-network::server", "Installs packages required for a OpenStack Network server"
recipe "openstack-network::db", "Creates the OpenStack Network database"
recipe "openstack-network::identity_registration", "Registers OpenStack Network endpoints and service user with Keystone"
%w{ ubuntu fedora redhat centos suse }.each do |os|
supports os
end
depends "database"
depends "openstack-identity", "~> 7.0"
depends "openstack-common", "~> 0.3.0"
depends "mysql"

View File

@ -1,32 +0,0 @@
#
# Cookbook Name:: openstack-network
# Recipe:: db
#
# Copyright 2012, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# This recipe should be placed in the run_list of the node that
# runs the database server that houses the Nova main database
class ::Chef::Recipe
include ::Openstack
end
db_pass = db_password "quantum"
db_create_with_user("network",
node["openstack"]["network"]["db"]["username"],
db_pass
)