aodh_wsgi.conf generated with a syntax error

[Lukas Piwowarski]

When packstack (master branch) is being deployed in a job for testing python-tempestconf [1] an error occurs regarding Puppet:

ERROR : Error appeared during Puppet run: 104.130.140.64_controller.pp
 Error: Systemd start for httpd failed!
 You will find full trace in log /var/tmp/packstack/20200525-122023-ndoucswb/manifests/104.130.140.64_controller.pp.log
 Please check log file /var/tmp/packstack/20200525-122023-ndoucswb/openstack-setup.log for more information
 Additional information:
  * Parameter CONFIG_NEUTRON_L2_AGENT: You have chosen OVN Neutron backend. Note that this backend does not support the VPNaaS or FWaaS services. Geneve will be used as the encapsulation method for tenant networks
  * A new answerfile was created in: /root/packstack-answers-20200525-122024.txt
  * Time synchronization installation was skipped. Please note that unsynchronized time on server instances might be problem for some OpenStack components.
  * Warning: NetworkManager is active on 104.130.140.64. OpenStack networking currently does not work on systems that have the Network Manager service enabled.
  * File /root/keystonerc_admin has been created on OpenStack client host 104.130.140.64. To use the command line tools you need to source the file.
  * To access the OpenStack Dashboard browse to http://104.130.140.64/dashboard .
  Please, find your login credentials stored in the keystonerc_admin in your home directory.

The var/log/messages contains the following two lines, which suggest that aodh_wsgi.conf file contains a syntax error:
May 25 12:31:15 centos-8-rax-dfw-0016766576 httpd[14129]: AH00526: Syntax error on line 26 of /etc/httpd/conf.d/10-aodh_wsgi.conf:
May 25 12:31:15 centos-8-rax-dfw-0016766576 httpd[14129]: Invalid option to WSGI daemon process definition.

The generated aodh_wsgi.conf file looks like this:
<VirtualHost *:8042>
  ServerName centos-8-rax-dfw-0016766576

  ## Vhost docroot
  DocumentRoot "/var/www/cgi-bin/aodh"

  ## Directories, there should at least be a declaration for /var/www/cgi-bin/aodh

  <Directory "/var/www/cgi-bin/aodh">
    Options -Indexes +FollowSymLinks +MultiViews
    AllowOverride None
    Require all granted
  </Directory>

  ## Logging
  ErrorLog "/var/log/httpd/aodh_wsgi_error.log"
  ServerSignature Off
  CustomLog "/var/log/httpd/aodh_wsgi_access.log" combined
  SetEnvIf X-Forwarded-Proto https HTTPS=1
  WSGIApplicationGroup %{GLOBAL}
  WSGIDaemonProcess {"aodh"=>{"user"=>"aodh", "group"=>"aodh", "processes"=>"2", "threads"=>1, "display-name"=>"aodh_wsgi"}}
  WSGIProcessGroup aodh
  WSGIScriptAlias / "/var/www/cgi-bin/aodh/app"
</VirtualHost>

The error is on the line:
WSGIDaemonProcess {"aodh"=>{"user"=>"aodh", "group"=>"aodh", "processes"=>"2", "threads"=>1, "display-name"=>"aodh_wsgi"}}

The line should probably look like the following line, which was generated when using packstack from stable/ussurri:
WSGIDaemonProcess aodh display-name=aodh_wsgi group=aodh processes=2 threads=1 user=aodh

[1] https://storage.gra.cloud.ovh.net/v1/AUTH_dcaab5e32b234d56b626f72581e3644c/zuul_opendev_logs_58a/722294/13/check/python-tempestconf-tempest-packstack-demo/58a5b9d/

[Javier Peña (jpena-c)]

I think this has been caused by [1], which requires a newer version of puppet-apache. Let me test it and see if that is the case.

[1] - https://opendev.org/openstack/puppet-openstacklib/commit/556f742e5ed43fc45ff4258cdae15b0dfca99a52

[OpenStack Infra (hudson-openstack)]

Change abandoned by Javier Peña (<email address hidden>) on branch: master
Review: https://review.opendev.org/730786
Reason: Merging in https://review.opendev.org/730837

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/731454

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/730837
Committed: https://git.openstack.org/cgit/x/packstack/commit/?id=b6df8c7ad0ea596b51dc8da814f54f8df5cba64c
Submitter: Zuul
Branch: master

commit b6df8c7ad0ea596b51dc8da814f54f8df5cba64c
Author: Javier Pena <email address hidden>
Date: Tue May 26 16:31:19 2020 +0200

    Fix CI jobs

    - Add jobs removed in [1] to the local configuration.
    - Fix SSH key distribution in multinode job. It was broken on a
      recent Zuul update, it seems.
    - Update puppetlabs-apache version to 5.4.0

    [1] - https://review.opendev.org/730813

    Closes-Bug: #1880681
    Depends-On: https://review.opendev.org/730813
    Change-Id: I2572d92cbaabc1f02fc0790896ccaa3edfc5e6c2

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/731454
Committed: https://git.openstack.org/cgit/x/packstack/commit/?id=88f5683a174e07b8f712f618952e003630b3ae5e
Submitter: Zuul
Branch: stable/ussuri

commit 88f5683a174e07b8f712f618952e003630b3ae5e
Author: Javier Pena <email address hidden>
Date: Tue May 26 16:31:19 2020 +0200

    Fix CI jobs

    - Add jobs removed in [1] to the local configuration.
    - Fix SSH key distribution in multinode job. It was broken on a
      recent Zuul update, it seems.
    - Update puppetlabs-apache version to 5.4.0

    [1] - https://review.opendev.org/730813

    Closes-Bug: #1880681
    Depends-On: https://review.opendev.org/730813
    Change-Id: I2572d92cbaabc1f02fc0790896ccaa3edfc5e6c2
    (cherry picked from commit 76b1559d3a161b0d2326ada77bc69d089639075f)