x/packstack
Code Issues Proposed changes

Merge "Deploy ceilometer api as wsgi"

Browse Source
This commit is contained in:
Jenkins 2016-03-16 09:37:38 +00:00 committed by Gerrit Code Review
commit bb483a129d
5 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/packstack.rst
View File

@ -1028,6 +1028,9 @@ Ceilometer Config parameters
**CONFIG_CEILOMETER_COORDINATION_BACKEND**
Backend driver for Telemetry's group membership coordination. ['redis', 'none']
**CONFIG_CEILOMETER_SERVICE_NAME**
Ceilometer service name. ['httpd', 'ceilometer']
MONGODB Config parameters
-------------------------

12
packstack/plugins/ceilometer_800.py
View File

@ -65,6 +65,18 @@ def initConfig(controller):
"NEED_CONFIRM": True,
"CONDITION": False},
{"CMD_OPTION": "ceilometer-service-name",
"PROMPT": "Enter the Ceilometer service name.",
"OPTION_LIST": ['ceilometer', 'httpd'],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "httpd",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": 'CONFIG_CEILOMETER_SERVICE_NAME',
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CONF_NAME": "CONFIG_CEILOMETER_COORDINATION_BACKEND",
"CMD_OPTION": "ceilometer-coordination-backend",
"PROMPT": "Enter the coordination driver",

26
packstack/puppet/templates/ceilometer.pp
View File

@ -28,6 +28,13 @@ if $config_ceilometer_coordination_backend == 'redis' {
$coordination_url = ''
}
if hiera('CONFIG_CEILOMETER_SERVICE_NAME') == 'ceilometer' {
$ceilometer_service_name = 'openstack-ceilometer-api'
} else {
$ceilometer_service_name = 'httpd'
}
class { '::ceilometer::db':
database_connection => "mongodb://${config_mongodb_host}:27017/ceilometer",
}
@ -56,5 +63,22 @@ class { '::ceilometer::api':
keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'),
api_workers => $service_workers
api_workers => $service_workers,
service_name => $ceilometer_service_name,
}
if $ceilometer_service_name == 'httpd' {
class { '::apache':
purge_configs => false,
}
class { '::ceilometer::wsgi::apache':
ssl => false,
}
if hiera('CONFIG_KEYSTONE_SERVICE_NAME') == 'httpd' {
apache::listen { '5000': }
apache::listen { '35357': }
}
}

4
packstack/puppet/templates/horizon.pp
View File

@ -61,6 +61,10 @@ if hiera('CONFIG_KEYSTONE_SERVICE_NAME') == 'httpd' {
apache::listen { '35357': }
}
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
apache::listen { '8777': }
}
if hiera('CONFIG_AODH_INSTALL') == 'y' {
apache::listen { '8042': }
}

4
packstack/puppet/templates/nagios_server.pp
View File

@ -104,6 +104,10 @@ if hiera('CONFIG_KEYSTONE_SERVICE_NAME') == 'httpd' {
apache::listen { '35357': }
}
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
apache::listen { '8777': }
}
if hiera('CONFIG_AODH_INSTALL') == 'y' {
apache::listen { '8042': }
}