openstack/devstack
Code Issues Proposed changes

Merge "Marconi fixes for precise"

Browse Source
This commit is contained in:
Jenkins
2014-02-15 01:54:26 +00:00
committed by Gerrit Code Review
parent b4596480b2 41d96d7b48
commit 6c42ecd96e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/marconi
View File

@@ -89,10 +89,6 @@ function configure_marconi() {
iniset $MARCONI_CONF DEFAULT verbose True
iniset $MARCONI_CONF 'drivers:transport:wsgi' bind '0.0.0.0'
# Install the policy file for the API server
cp $MARCONI_DIR/etc/marconi/policy.json $MARCONI_CONF_DIR
iniset $MARCONI_CONF DEFAULT policy_file $MARCONI_CONF_DIR/policy.json
iniset $MARCONI_CONF keystone_authtoken auth_protocol http
iniset $MARCONI_CONF keystone_authtoken admin_user marconi
iniset $MARCONI_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
@@ -109,9 +105,16 @@ function configure_marconi() {
function configure_mongodb() {
# Set nssize to 2GB. This increases the number of namespaces supported
# # per database.
sudo sed -i '/--nssize/!s/OPTIONS=\"/OPTIONS=\"--nssize 2047 /' /etc/sysconfig/mongod
restart_service mongod
if is_ubuntu; then
sudo sed -i -e "
s|[^ \t]*#[ \t]*\(nssize[ \t]*=.*\$\)|\1|
s|^\(nssize[ \t]*=[ \t]*\).*\$|\1 2047|
" /etc/mongodb.conf
restart_service mongodb
elif is_fedora; then
sudo sed -i '/--nssize/!s/OPTIONS=\"/OPTIONS=\"--nssize 2047 /' /etc/sysconfig/mongod
restart_service mongod
fi
}
# init_marconi() - Initialize etc.