Removed 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. Change-Id: Ic9467b2473b9c5eea6dd4f74c9d5f83f47e86814
This commit is contained in:
parent
7199a69667
commit
3edd2feeba
|
@ -16,11 +16,9 @@ Cookbooks
|
|||
The following cookbooks are dependencies:
|
||||
|
||||
* apt
|
||||
* database
|
||||
* openstack-common
|
||||
* openstack-identity
|
||||
* openstack-image
|
||||
* mysql
|
||||
* openssh
|
||||
* rabbitmq
|
||||
* selinux (Fedora)
|
||||
|
@ -33,10 +31,6 @@ api
|
|||
- Installs the cinder-api, sets up the cinder database,
|
||||
and cinder service/user/endpoints in keystone
|
||||
|
||||
db
|
||||
--
|
||||
- Creates the Cinder database
|
||||
|
||||
scheduler
|
||||
----
|
||||
- Installs the cinder-scheduler service
|
||||
|
|
|
@ -8,7 +8,6 @@ version "7.0.0"
|
|||
|
||||
recipe "openstack-block-storage::common", "Defines the common pieces of repeated code from the other recipes"
|
||||
recipe "openstack-block-storage::api", "Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone"
|
||||
recipe "openstack-block-storage::db", "Creates the Cinder database"
|
||||
recipe "openstack-block-storage::keystone_registration", "Registers cinder service/user/endpoints in keystone"
|
||||
recipe "openstack-block-storage::scheduler", "Installs the cinder-scheduler service"
|
||||
recipe "openstack-block-storage::volume", "Installs the cinder-volume service and sets up the iscsi helper"
|
||||
|
@ -18,11 +17,9 @@ recipe "openstack-block-storage::volume", "Installs the cinder-volume
|
|||
end
|
||||
|
||||
depends "apt"
|
||||
depends "database"
|
||||
depends "openstack-common", "~> 0.3.0"
|
||||
depends "openstack-identity", "~> 7.0.0"
|
||||
depends "openstack-image", "~> 7.0.0"
|
||||
depends "mysql"
|
||||
depends "openssh"
|
||||
depends "rabbitmq"
|
||||
depends "selinux"
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
#
|
||||
# Cookbook Name:: openstack-block-storage
|
||||
# Recipe:: db
|
||||
#
|
||||
# Copyright 2012-2013, AT&T Services, Inc.
|
||||
#
|
||||
# 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 Cinder main database
|
||||
|
||||
class ::Chef::Recipe
|
||||
include ::Openstack
|
||||
end
|
||||
|
||||
# TODO(jaypipes): This is retarded, but nothing runs without this. The
|
||||
# database cookbook should handle this crap, but it doesn't. :(
|
||||
include_recipe "mysql::client"
|
||||
include_recipe "mysql::ruby"
|
||||
|
||||
db_pass = db_password "cinder"
|
||||
|
||||
db_create_with_user("volume",
|
||||
node["openstack"]["block-storage"]["db"]["username"],
|
||||
db_pass
|
||||
)
|
|
@ -1,24 +0,0 @@
|
|||
require_relative "spec_helper"
|
||||
|
||||
describe "openstack-block-storage::db" do
|
||||
it "installs mysql packages" do
|
||||
@chef_run = converge
|
||||
|
||||
expect(@chef_run).to include_recipe "mysql::client"
|
||||
expect(@chef_run).to include_recipe "mysql::ruby"
|
||||
end
|
||||
|
||||
it "creates database and user" do
|
||||
::Chef::Recipe.any_instance.should_receive(:db_create_with_user).
|
||||
with "volume", "cinder", "test-pass"
|
||||
|
||||
converge
|
||||
end
|
||||
|
||||
def converge
|
||||
::Chef::Recipe.any_instance.stub(:db_password).with("cinder").
|
||||
and_return "test-pass"
|
||||
|
||||
::ChefSpec::ChefRunner.new(::UBUNTU_OPTS).converge "openstack-block-storage::db"
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue