openstack
/
deb-openstack-meta-packages
Code Issues Proposed changes

Also preseed and install Aodh

This commit is contained in:
Thomas Goirand 2016-01-31 12:29:51 +08:00
parent cb4fbf817c
commit 26e591795e
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/control vendored
View File

@ -65,9 +65,10 @@ Description: Metapackage to install an Openstack keystone
Package: openstack-proxy-node
Architecture: all
Pre-Depends: openstack-cloud-identity
Depends: ceilometer-agent-central,
ceilometer-alarm-evaluator,
ceilometer-alarm-notifier,
Depends: aodh-api,
aodh-evaluator,
aodh-notifier,
ceilometer-agent-central,
ceilometer-api,
ceilometer-collector,
glance,

4
src/openstack-deploy
View File

@ -188,6 +188,10 @@ osinstall_preseed_all () {
os_preseed_heat ${RC_HEAT_SQL_PASS} ${RC_MYSQL_PASSWORD} ${RC_MYSQL_SERVER_HOSTNAME} \
${RC_KEYSTONE_ENDPOINT_IP} ${RC_KEYSTONE_REGION} ${RC_KEYSTONE_ADMINPASS} ${RC_KEYSTONE_AUTHTOKEN} \
${RC_RABIT_HOST} ${RC_RABIT_USER} ${RC_RABIT_PASS}
osinstall_rcvalue RC_AODH_SQL_PASS "Aodh MySQL password [generated-password]: " yes
os_preseed_aodh ${RC_AODH_SQL_PASS} ${RC_MYSQL_PASSWORD} ${RC_MYSQL_SERVER_HOSTNAME} \
${RC_KEYSTONE_ENDPOINT_IP} ${RC_KEYSTONE_REGION} ${RC_KEYSTONE_ADMINPASS} ${RC_KEYSTONE_AUTHTOKEN} \
${RC_RABIT_HOST} ${RC_RABIT_USER} ${RC_RABIT_PASS}
os_pressed_horizon
}

18
src/preseed-lib
View File

@ -419,6 +419,24 @@ os_preseed_heat () {
os_preseed_rabbit_creds heat-common heat ${RBT_HOST} ${RBT_LOGIN} ${RBT_PASS}
}
os_preseed_aodh () {
local AODH_SQL_PASS MYSQL_PASSWORD MYSQL_HOST KEYSTONE_ENDPOINT_IP KEYSTONE_REGION KEYSTONE_ADMIN_PASS KEYSTONE_AUTH_TOKEN RBT_HOST RBT_LOGIN RBT_PASS
AODH_SQL_PASS=${1}
MYSQL_PASSWORD=${2}
MYSQL_HOST=${3}
KEYSTONE_ENDPOINT_IP=${4}
KEYSTONE_REGION=${5}
KEYSTONE_ADMIN_PASS=${6}
KEYSTONE_AUTH_TOKEN=${7}
RBT_HOST=${8}
RBT_LOGIN=${9}
RBT_PASS=${10}
os_preseed_set_dbconfig_conf aodh-common aodh ${HEAT_SQL_PASS} aodhdb aodh ${MYSQL_PASSWORD} ${MYSQL_HOST}
os_preseed_endpoint aodh-api aodh ${KEYSTONE_ENDPOINT_IP} ${KEYSTONE_REGION} ${KEYSTONE_AUTH_TOKEN}
os_preseed_keystone_autotoken aodh-common aodh ${KEYSTONE_ENDPOINT_IP} admin admin ${KEYSTONE_ADMIN_PASS}
os_preseed_rabbit_creds aodh-common aodh ${RBT_HOST} ${RBT_LOGIN} ${RBT_PASS}
}
os_pressed_horizon () {
echo "openstack-dashboard-apache horizon/activate_vhost boolean true
openstack-dashboard-apache horizon/activate_vhost seen true