commit 02b8db2e6e2ca370992e813fef7e2d09c69ed5d1
Author: David Ames <email address hidden>
Date: Wed Nov 8 18:40:12 2017 +0000
Ensure HTTPS configuration completes
There was a race where the https apache2 site,
openstack_https_frontend.conf, would be rendered in one hook, then
subsequently the config-changed hook would run and enable that site.
However, the subsequent config-changed hook would see the template as
having not changed and therefore it would fail to restart apache2.
This lead to apache2 failing to listen on the correct ports.
This was due to CONFIGS.write_all() being called but a2ensite not
being called. This change fixes this race and adds a call to
configure_https() to ensure the configuration completes and apache2
is restarted.
Change-Id: I229d25c707a0630c9d609fd20a962a0de2e42c77
Closes-Bug: #1723892
(cherry picked from commit 7c065062d292b3f87254deb4333623a5b967e276)
Reviewed: https:/ /review. openstack. org/518742 /git.openstack. org/cgit/ openstack/ charm-keystone/ commit/ ?id=02b8db2e6e2 ca370992e813fef 7e2d09c69ed5d1
Committed: https:/
Submitter: Zuul
Branch: stable/17.08
commit 02b8db2e6e2ca37 0992e813fef7e2d 09c69ed5d1
Author: David Ames <email address hidden>
Date: Wed Nov 8 18:40:12 2017 +0000
Ensure HTTPS configuration completes
There was a race where the https apache2 site, https_frontend. conf, would be rendered in one hook, then
openstack_
subsequently the config-changed hook would run and enable that site.
However, the subsequent config-changed hook would see the template as
having not changed and therefore it would fail to restart apache2.
This lead to apache2 failing to listen on the correct ports.
This was due to CONFIGS.write_all() being called but a2ensite not https() to ensure the configuration completes and apache2
being called. This change fixes this race and adds a call to
configure_
is restarted.
Change-Id: I229d25c707a063 0c9d609fd20a962 a0de2e42c77 87254deb4333623 a5b967e276)
Closes-Bug: #1723892
(cherry picked from commit 7c065062d292b3f