x/almanach
Code Issues Proposed changes

Merge "Update devstack plugin"

Browse Source
This commit is contained in:
Jenkins 2016-11-30 21:48:57 +00:00 committed by Gerrit Code Review
commit d77d2a90b6
4 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
devstack/plugin.sh
View File

@ -27,29 +27,18 @@ function _install_mongodb {
function almanach_configure { function almanach_configure {
sudo install -d -o $STACK_USER -m 755 $ALMANACH_CONF_DIR sudo install -d -o $STACK_USER -m 755 $ALMANACH_CONF_DIR
cp ${ALMANACH_DIR}/almanach/resources/config/almanach.cfg $ALMANACH_CONF
iniset $ALMANACH_CONF ALMANACH auth_token secret iniset $ALMANACH_CONF DEFAULT debug "True"
iniset $ALMANACH_CONF ALMANACH auth_strategy private_key
iniset $ALMANACH_CONF ALMANACH volume_existence_threshold 60
iniset $ALMANACH_CONF ALMANACH device_metadata_whitelist metering.billing_mode
iniset $ALMANACH_CONF MONGODB url mongodb://localhost/almanach iniset $ALMANACH_CONF api bind_ip $ALMANACH_SERVICE_HOST
iniset $ALMANACH_CONF MONGODB database almanach iniset $ALMANACH_CONF api bind_port $ALMANACH_SERVICE_PORT
iniset $ALMANACH_CONF MONGODB indexes project_id,start,end
iniset $ALMANACH_CONF RABBITMQ url amqp://stackrabbit:secret@localhost:5672 iniset $ALMANACH_CONF auth auth_token secret
iniset $ALMANACH_CONF RABBITMQ indexes project_id,start,end iniset $ALMANACH_CONF auth auth_strategy private_key
iniset $ALMANACH_CONF RABBITMQ queue almanach.info
iniset $ALMANACH_CONF RABBITMQ exchange almanach.info iniset $ALMANACH_CONF collector transport_url rabbit://stackrabbit:secret@localhost:5672
iniset $ALMANACH_CONF RABBITMQ routing.key almanach.info
iniset $ALMANACH_CONF RABBITMQ retry.time.to.live 10 iniset $ALMANACH_CONF database connection_url mongodb://localhost/almanach
iniset $ALMANACH_CONF RABBITMQ retry.exchange almanach.retry
iniset $ALMANACH_CONF RABBITMQ retry.maximum 3
iniset $ALMANACH_CONF RABBITMQ retry.queue almanach.retry
iniset $ALMANACH_CONF RABBITMQ retry.return.exchange almanach
iniset $ALMANACH_CONF RABBITMQ dead.queue almanach.dead
iniset $ALMANACH_CONF RABBITMQ dead.exchange almanach.dead
} }
# Create almanach related accounts in Keystone # Create almanach related accounts in Keystone
@ -78,12 +67,14 @@ function install_almanach {
} }
function start_almanach { function start_almanach {
run_process almanach-collector "$ALMANACH_BIN_DIR/almanach collector $ALMANACH_CONF" run_process almanach-collector "$ALMANACH_BIN_DIR/almanach-collector --config-file $ALMANACH_CONF"
run_process almanach-api "$ALMANACH_BIN_DIR/almanach api $ALMANACH_CONF --host 0.0.0.0" run_process almanach-api "$ALMANACH_BIN_DIR/almanach-api --config-file $ALMANACH_CONF"
} }
function stop_almanach { function stop_almanach {
echo "todo" for serv in almanach-api almanach-collector; do
stop_process $serv
done
} }
ALMANACH_BIN_DIR=$(get_python_exec_prefix) ALMANACH_BIN_DIR=$(get_python_exec_prefix)

1
devstack/settings
View File

@ -9,4 +9,3 @@ ALMANACH_CONF=$ALMANACH_CONF_DIR/almanach.cfg
ALMANACH_SERVICE_PROTOCOL=http ALMANACH_SERVICE_PROTOCOL=http
ALMANACH_SERVICE_HOST=${ALMANACH_SERVICE_HOST:-${SERVICE_HOST}} ALMANACH_SERVICE_HOST=${ALMANACH_SERVICE_HOST:-${SERVICE_HOST}}
ALMANACH_SERVICE_PORT=${ALMANACH_SERVICE_PORT:-8000} ALMANACH_SERVICE_PORT=${ALMANACH_SERVICE_PORT:-8000}

10
requirements.txt
View File

@ -1,10 +1,10 @@
pbr>=1.10.0 pbr>=1.8 # Apache-2.0
Flask==0.10.1 Flask>=0.10,!=0.11,<1.0 # BSD
jsonpickle==0.7.1 jsonpickle==0.7.1
pymongo>=3.0.2,!=3.1 # Apache-2.0 pymongo>=3.0.2,!=3.1 # Apache-2.0
pytz>=2014.10 pytz>=2013.6 # MIT
voluptuous==0.8.11 voluptuous>=0.8.9 # BSD License
python-keystoneclient>=1.6.0 python-keystoneclient>=3.6.0 # Apache-2.0
six>=1.9.0 # MIT six>=1.9.0 # MIT
oslo.serialization>=1.10.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0
oslo.config>=3.14.0 # Apache-2.0 oslo.config>=3.14.0 # Apache-2.0

8
test-requirements.txt
View File

@ -1,12 +1,8 @@
setuptools==0.9.8
coverage==3.6b1
nose==1.2.1
cov-core==1.7
nose-cov==1.6
nose-blockage==0.1.2
flexmock==0.9.4 flexmock==0.9.4
mongomock==2.0.0 mongomock==2.0.0
PyHamcrest==1.8.5 PyHamcrest==1.8.5
nose # LGPL
setuptools>=16.0,!=24.0.0 # PSF/ZPL
sphinx>=1.2.1,!=1.3b1,<1.3 # BSD sphinx>=1.2.1,!=1.3b1,<1.3 # BSD
sphinxcontrib-httpdomain # BSD sphinxcontrib-httpdomain # BSD
flake8>=2.5.4,<2.6.0 # MIT flake8>=2.5.4,<2.6.0 # MIT