openstack
/
monasca-agent
Code Issues Proposed changes

Detect httpd on openSUSE/SLES 

The apache2 process name on openSUSE might be 'httpd-prefork'. Otherwise
while running monasca-setup, the error is:

      ERROR: Apache process does not exist.

Change-Id: I11a2220283d27d3d65248287b90c7f4455d11e9a
This commit is contained in:
Thomas Bechtold 2017-04-13 15:19:43 +02:00
parent 7fdb297fe7
commit 56ff5b04da
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monasca_setup/detection/plugins/apache.py
View File

@ -9,8 +9,9 @@ import monasca_setup.detection
log = logging.getLogger(__name__)
# Process name is apache2 on Debian derivatives, on RHEL derivatives it's httpd
APACHE_PROCESS_NAMES = ('apache2', 'httpd')
# Process name is apache2 on Debian derivatives, on RHEL derivatives it's httpd,
# on openSUSE/SLES it might be httpd-prefork
APACHE_PROCESS_NAMES = ('apache2', 'httpd', 'httpd-prefork')
DEFAULT_APACHE_CONFIG = '/root/.apache.cnf'
CONFIG_ARG_KEYS = set(["url", "user", "password", "use_server_status_metrics"])