Activate new healthchecks

In previous patches link to appropriate scripts were not added.
This patch adds links related to following already merged patches:
 - I31ab3f6777acddc802a321ff9a4728ebf574c0d4
 - If6e4fba9da81350046630420e5bee0ee4cbd14cc
 - I1109909189b2c14c89913e217e2eb3b520897596
 - I010e3e4cc7eca59c5c5b8739e2ce145d4dc8a3f1
 - Icbf450a797f95fb5966005295bd33975077e4aa5
 - Iabc042d2539963fdc59ec538e269c83f87c1843f
 - I5f8f687eecead27accb4401f9aa00aaca63ff6df
 - I290704c72e104e40d104d63583155d0eba7c128e
 - I3efc1996d67d270a6fc453a8cfcaf6f6eeae6218
 - Idd759abc454b17f3798900c5bab9ef68899610d7
 - I2e55b99a3971acf3df722415a50a4f8966e2cd25
 - Iebb0cdb911c65a78eeba148337028e8ef9aad4be
 - I8336d5778354fc21a3d9fb394fe8776febcc9173
 - Icae9acdd6b10b341c1b189872b7ef864d7ea0806
 - If9476b2dd485f8399d10289989ba74a2c1f58626
 - Id10f0d52b1732003533aba6b5c89a5079baba852
 - Ic0573f6dfe550dd7f5d6bc579b3b06660d4bf1fc

This patch also adds exec permission to healthchecks added
in above patches.

Change-Id: Ib82cb849540694106a869ec81694f1159967ee79
This commit is contained in:
Martin Mágr 2018-01-30 12:45:02 +01:00
parent c813565137
commit f330e0fec6
21 changed files with 109 additions and 2 deletions

View File

@ -61,7 +61,10 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% block neutron_server_footer %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \
&& echo "if [[ "\$\(whoami\)" == 'root' ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*; fi" >> /usr/local/bin/kolla_neutron_extend_start
&& echo "if [[ "\$\(whoami\)" == 'root' ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*; fi" >> /usr/local/bin/kolla_neutron_extend_start; \
mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
# NOTE (jaosorior): redis with TLS everywhere needs these packages.
@ -116,6 +119,12 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
############################ service container footers #########################
{% block aodh_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/aodh-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block aodh_evaluator_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/aodh-evaluator /openstack/healthcheck && \
@ -134,6 +143,24 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block barbican_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block barbican_keystone_listener_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-keystone-listener /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block barbican_worker_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/barbican-worker /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block ceilometer_central_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \
@ -152,6 +179,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block cinder_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/cinder-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% set cinder_backup_packages_append = [
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
{% block cinder_backup_footer %}
@ -174,6 +207,18 @@ RUN mkdir -p /etc/libqb /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block collectd_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/collectd /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block etcd_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/etcd /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block glance_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/glance-api /openstack/healthcheck && \
@ -183,6 +228,24 @@ RUN mkdir -p /openstack && \
echo "if [[ "\$\(whoami\)" == 'root' ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*; fi" >> /usr/local/bin/kolla_glance_extend_start
{% endblock %}
{% block gnocchi_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/gnocchi-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block gnocchi_metricd_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/gnocchi-metricd /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block gnocchi_statsd_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/gnocchi-statsd /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block heat_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-api /openstack/healthcheck && \
@ -225,6 +288,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block iscsid_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/iscsid /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block keystone_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone-public /openstack/healthcheck && \
@ -252,6 +321,18 @@ RUN mkdir -p /etc/libqb /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block memcached_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/memcached /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block mistral_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block mistral_engine_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-engine /openstack/healthcheck && \
@ -264,6 +345,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block multipathd_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/multipathd /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block neutron_dhcp_agent_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-dhcp /openstack/healthcheck && \
@ -330,6 +417,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block nova_placement_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-placement /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block octavia_health_manager_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-health-manager /openstack/healthcheck && \
@ -354,6 +447,12 @@ RUN mkdir -p /openstack && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block panko_api_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/panko-api /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% set rabbitmq_packages_append = [
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
{% block rabbitmq_footer %}
@ -363,7 +462,9 @@ RUN mkdir -p /etc/libqb /openstack && \
{% endblock %}
{% block redis_footer %}
RUN mkdir /etc/libqb
RUN mkdir /etc/libqb; mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/redis /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% block sahara_engine_footer %}
@ -408,6 +509,12 @@ RUN mkdir -p /openstack && \
echo "if [[ "\$\(whoami\)" == 'root' ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*; fi" >> /usr/local/bin/kolla_extend_start
{% endblock %}
{% block tacker_server_footer %}
RUN mkdir -p /openstack && \
ln -s /usr/share/openstack-tripleo-common/healthcheck/tacker /openstack/healthcheck && \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% set ovn_northd_packages_append = [
'pacemaker', 'pacemaker-remote', 'pcs', 'libqb', 'resource-agents'] %}
{% block ovn_northd_footer %}

0
healthcheck/aodh-api Normal file → Executable file
View File

0
healthcheck/cinder-api Normal file → Executable file
View File

0
healthcheck/collectd Normal file → Executable file
View File

0
healthcheck/etcd Normal file → Executable file
View File

0
healthcheck/gnocchi-api Normal file → Executable file
View File

0
healthcheck/gnocchi-metricd Normal file → Executable file
View File

0
healthcheck/gnocchi-statsd Normal file → Executable file
View File

0
healthcheck/ironic-api Normal file → Executable file
View File

0
healthcheck/ironic-pxe Normal file → Executable file
View File

0
healthcheck/iscsid Normal file → Executable file
View File

0
healthcheck/memcached Normal file → Executable file
View File

0
healthcheck/mistral-api Normal file → Executable file
View File

0
healthcheck/mistral-event-engine Normal file → Executable file
View File

0
healthcheck/multipathd Normal file → Executable file
View File

0
healthcheck/neutron-api Normal file → Executable file
View File

0
healthcheck/nova-placement Normal file → Executable file
View File

0
healthcheck/opendaylight-api Normal file → Executable file
View File

0
healthcheck/panko-api Normal file → Executable file
View File

0
healthcheck/redis Normal file → Executable file
View File

0
healthcheck/tacker Normal file → Executable file
View File