From 1abff9af09d4a4819bae87329b45027daa4b2a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Mon, 14 Aug 2017 14:42:28 +0200 Subject: [PATCH] Use correct path in healthcheck scripts Currently /usr/share/tripleo-common is used in healthcheck scripts, but only /usr/share/openstack-tripleo-common is available in container images Closes-Bug: #1710629 Change-Id: Id7d169cfd34bf2a45e9bff0e389e77189cb774d7 --- .../tripleo_kolla_template_overrides.j2 | 80 +++++++++---------- healthcheck/aodh-evaluator | 2 +- healthcheck/aodh-listener | 2 +- healthcheck/aodh-notifier | 2 +- healthcheck/ceilometer-agent-central | 2 +- healthcheck/ceilometer-agent-ipmi | 2 +- healthcheck/ceilometer-agent-notification | 2 +- healthcheck/cinder-backup | 2 +- healthcheck/cinder-scheduler | 2 +- healthcheck/cinder-volume | 2 +- healthcheck/glance-api | 2 +- healthcheck/heat-api | 2 +- healthcheck/heat-api-cfn | 2 +- healthcheck/heat-engine | 2 +- healthcheck/ironic-conductor | 2 +- healthcheck/keystone-admin | 2 +- healthcheck/keystone-public | 2 +- healthcheck/manila-scheduler | 2 +- healthcheck/mistral-engine | 2 +- healthcheck/mistral-executor | 2 +- healthcheck/neutron-dhcp | 2 +- healthcheck/neutron-l3 | 2 +- healthcheck/neutron-metadata | 2 +- healthcheck/neutron-ovs-agent | 2 +- healthcheck/nova-api | 2 +- healthcheck/nova-compute | 2 +- healthcheck/nova-conductor | 2 +- healthcheck/nova-consoleauth | 2 +- healthcheck/nova-ironic | 2 +- healthcheck/nova-scheduler | 2 +- healthcheck/nova-vnc-proxy | 2 +- healthcheck/octavia-health-manager | 2 +- healthcheck/octavia-housekeeping | 2 +- healthcheck/octavia-worker | 2 +- healthcheck/sahara-engine | 2 +- healthcheck/sensu-client | 2 +- healthcheck/swift-account-server | 2 +- healthcheck/swift-container-server | 2 +- healthcheck/swift-object-server | 2 +- healthcheck/swift-proxy | 2 +- 40 files changed, 79 insertions(+), 79 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 305819a42..8ebc817cd 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -79,42 +79,42 @@ {% block aodh_evaluator_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/aodh-evaluator /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/aodh-evaluator /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block aodh_listener_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/aodh-listener /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/aodh-listener /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block aodh_notifier_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/aodh-notifier /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/aodh-notifier /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block ceilometer_central_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-central /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block ceilometer_ipmi_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/ceilometer-agent-ipmi /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-ipmi /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block ceilometer_notification_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/ceilometer-agent-notification /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/ceilometer-agent-notification /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -123,14 +123,14 @@ HEALTHCHECK CMD /openstack/healthcheck RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/cinder-backup /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/cinder-backup /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block cinder_scheduler_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/cinder-scheduler /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/cinder-scheduler /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -139,35 +139,35 @@ HEALTHCHECK CMD /openstack/healthcheck RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/cinder-volume /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/cinder-volume /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block glance_api_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/glance-api /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/glance-api /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block heat_api_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/heat-api /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-api /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block heat_api_cfn_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/heat-api-cnf /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-api-cnf /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block heat_engine_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/heat-engine /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/heat-engine /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -178,21 +178,21 @@ RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir {% block ironic_conductor_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/ironic-conductor /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/ironic-conductor /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block keystone_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/keystone-public /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/keystone-public /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block manila_scheduler_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/manila-scheduler /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/manila-scheduler /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -208,119 +208,119 @@ RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/mariadb /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/mariadb /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block mistral_engine_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/mistral-engine /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-engine /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block mistral_executor_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/mistral-executor /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/mistral-executor /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block neutron_dhcp_agent_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/neutron-dhcp /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-dhcp /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block neutron_l3_agent_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/neutron-l3 /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-l3 /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block neutron_metadata_agent_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/neutron-metadata /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-metadata /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block neutron_openvswitch_agent_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/neutron-ovs-agent /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/neutron-ovs-agent /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_api_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-api /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-api /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_compute_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-compute /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-compute /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_compute_ironic_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-ironic /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-ironic /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_consoleauth_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-consoleauth /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-consoleauth /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_novncproxy_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-vnc-proxy /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-vnc-proxy /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %}] {% block nova_scheduler_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-scheduler /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-scheduler /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block nova_conductor_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/nova-conductor /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-conductor /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block octavia_health_manager_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/octavia-health-manager /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-health-manager /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block octavia_housekeeping_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/octavia-housekeeping /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-housekeeping /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block octavia_worker_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/octavia-worker /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-worker /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -329,7 +329,7 @@ HEALTHCHECK CMD /openstack/healthcheck RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/rabbitmq /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/rabbitmq /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} @@ -340,42 +340,42 @@ RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir {% block sahara_engine_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/sahara-engine /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/sahara-engine /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block sensu_client_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/sensu-client /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/sensu-client /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block swift_account_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/swift-account-server /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-account-server /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block swift_container_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/swift-container-server /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-container-server /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block swift_object_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/swift-object-server /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-object-server /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} {% block swift_proxy_server_footer %} RUN mkdir -p /openstack && \ - ln -s /usr/share/tripleo-common/healthcheck/swift-proxy /openstack/healthcheck && \ + ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-proxy /openstack/healthcheck && \ chmod -R a+rx /openstack HEALTHCHECK CMD /openstack/healthcheck {% endblock %} diff --git a/healthcheck/aodh-evaluator b/healthcheck/aodh-evaluator index 52c6b9a12..16f68a48e 100644 --- a/healthcheck/aodh-evaluator +++ b/healthcheck/aodh-evaluator @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='aodh-evaluator' args="${@:-5671 5672}" diff --git a/healthcheck/aodh-listener b/healthcheck/aodh-listener index c5c52f1c4..edb8d5d12 100644 --- a/healthcheck/aodh-listener +++ b/healthcheck/aodh-listener @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='aodh-listener' args="${@:-5671 5672}" diff --git a/healthcheck/aodh-notifier b/healthcheck/aodh-notifier index 6957d02fa..fc4a845d2 100644 --- a/healthcheck/aodh-notifier +++ b/healthcheck/aodh-notifier @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='aodh-notifier' args="${@:-5671 5672}" diff --git a/healthcheck/ceilometer-agent-central b/healthcheck/ceilometer-agent-central index 9da9df780..e1425f745 100644 --- a/healthcheck/ceilometer-agent-central +++ b/healthcheck/ceilometer-agent-central @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='ceilometer-polling' args="${@:-5671 5672}" diff --git a/healthcheck/ceilometer-agent-ipmi b/healthcheck/ceilometer-agent-ipmi index 9da9df780..e1425f745 100644 --- a/healthcheck/ceilometer-agent-ipmi +++ b/healthcheck/ceilometer-agent-ipmi @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='ceilometer-polling' args="${@:-5671 5672}" diff --git a/healthcheck/ceilometer-agent-notification b/healthcheck/ceilometer-agent-notification index 3de922a58..f456e60b7 100644 --- a/healthcheck/ceilometer-agent-notification +++ b/healthcheck/ceilometer-agent-notification @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='ceilometer-agent-notification' args="${@:-5671 5672}" diff --git a/healthcheck/cinder-backup b/healthcheck/cinder-backup index 67a7e8e93..9c7a15d31 100644 --- a/healthcheck/cinder-backup +++ b/healthcheck/cinder-backup @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='cinder-backup' args="${@:-5671 5672}" diff --git a/healthcheck/cinder-scheduler b/healthcheck/cinder-scheduler index b4dd9634c..86fb99899 100644 --- a/healthcheck/cinder-scheduler +++ b/healthcheck/cinder-scheduler @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='cinder-scheduler' args="${@:-5671 5672}" diff --git a/healthcheck/cinder-volume b/healthcheck/cinder-volume index 1f34adafe..a0e371a35 100644 --- a/healthcheck/cinder-volume +++ b/healthcheck/cinder-volume @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='cinder-volume' args="${@:-5671 5672}" diff --git a/healthcheck/glance-api b/healthcheck/glance-api index 1f220a790..e68e9d1f7 100755 --- a/healthcheck/glance-api +++ b/healthcheck/glance-api @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/glance/glance-api.conf DEFAULT bind_host 127.0.0.1) bind_port=$(get_config_val /etc/glance/glance-api.conf DEFAULT bind_port 9292) diff --git a/healthcheck/heat-api b/healthcheck/heat-api index 0f981c8e1..c0cd786e4 100755 --- a/healthcheck/heat-api +++ b/healthcheck/heat-api @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/heat/heat.conf heat_api bind_host 127.0.0.1) bind_port=$(get_config_val /etc/heat/heat.conf heat_api bind_port 8004) diff --git a/healthcheck/heat-api-cfn b/healthcheck/heat-api-cfn index 4120494c2..f852ad93d 100755 --- a/healthcheck/heat-api-cfn +++ b/healthcheck/heat-api-cfn @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/heat/heat.conf heat_api_cfn bind_host 127.0.0.1) bind_port=$(get_config_val /etc/heat/heat.conf heat_api_cfn bind_port 8000) diff --git a/healthcheck/heat-engine b/healthcheck/heat-engine index 0a7d5fcce..77d9a1b1c 100644 --- a/healthcheck/heat-engine +++ b/healthcheck/heat-engine @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='heat-engine' args="${@:-5671 5672}" diff --git a/healthcheck/ironic-conductor b/healthcheck/ironic-conductor index cefd4539f..ce48aa99b 100644 --- a/healthcheck/ironic-conductor +++ b/healthcheck/ironic-conductor @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='ironic-conductor' args="${@:-5671 5672}" diff --git a/healthcheck/keystone-admin b/healthcheck/keystone-admin index 6e1cc819f..a88789463 100755 --- a/healthcheck/keystone-admin +++ b/healthcheck/keystone-admin @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/keystone/keystone.conf DEFAULT admin_bind_host 127.0.0.1) bind_port=$(get_config_val /etc/keystone/keystone.conf DEFAULT admin_port 5000) diff --git a/healthcheck/keystone-public b/healthcheck/keystone-public index 2be61b996..add5371e2 100755 --- a/healthcheck/keystone-public +++ b/healthcheck/keystone-public @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/keystone/keystone.conf DEFAULT public_bind_host 127.0.0.1) bind_port=$(get_config_val /etc/keystone/keystone.conf DEFAULT public_port 5000) diff --git a/healthcheck/manila-scheduler b/healthcheck/manila-scheduler index 08898e177..f1e0b17da 100644 --- a/healthcheck/manila-scheduler +++ b/healthcheck/manila-scheduler @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='manila-scheduler' args="${@:-5671 5672}" diff --git a/healthcheck/mistral-engine b/healthcheck/mistral-engine index 67d0652a0..d51538a42 100644 --- a/healthcheck/mistral-engine +++ b/healthcheck/mistral-engine @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='mistral-server' args="${@:-5671 5672}" diff --git a/healthcheck/mistral-executor b/healthcheck/mistral-executor index 67d0652a0..d51538a42 100644 --- a/healthcheck/mistral-executor +++ b/healthcheck/mistral-executor @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='mistral-server' args="${@:-5671 5672}" diff --git a/healthcheck/neutron-dhcp b/healthcheck/neutron-dhcp index 3d3585b9d..cd589d72a 100644 --- a/healthcheck/neutron-dhcp +++ b/healthcheck/neutron-dhcp @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='neutron-dhcp-agent' args="${@:-5671 5672}" diff --git a/healthcheck/neutron-l3 b/healthcheck/neutron-l3 index 0225b7447..084104be5 100644 --- a/healthcheck/neutron-l3 +++ b/healthcheck/neutron-l3 @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='neutron-l3-agent' args="${@:-5671 5672}" diff --git a/healthcheck/neutron-metadata b/healthcheck/neutron-metadata index 81188ef9f..07547c1ae 100644 --- a/healthcheck/neutron-metadata +++ b/healthcheck/neutron-metadata @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='neutron-metadata-agent' args="${@:-5671 5672}" diff --git a/healthcheck/neutron-ovs-agent b/healthcheck/neutron-ovs-agent index a8c4c0a49..86e5b3c00 100644 --- a/healthcheck/neutron-ovs-agent +++ b/healthcheck/neutron-ovs-agent @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='neutron-openvswitch-agent' args="${@:-5671 5672}" diff --git a/healthcheck/nova-api b/healthcheck/nova-api index 792e33df0..fc8ca6117 100755 --- a/healthcheck/nova-api +++ b/healthcheck/nova-api @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh bind_host=$(get_config_val /etc/nova/nova.conf DEFAULT osapi_compute_listen 127.0.0.1) bind_port=$(get_config_val /etc/nova/nova.conf DEFAULT osapi_compute_listen_port 8774) diff --git a/healthcheck/nova-compute b/healthcheck/nova-compute index ff2f703a4..24c412a7a 100644 --- a/healthcheck/nova-compute +++ b/healthcheck/nova-compute @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-compute' args="${@:-5671 5672}" diff --git a/healthcheck/nova-conductor b/healthcheck/nova-conductor index 41a7960e7..c251fd62a 100644 --- a/healthcheck/nova-conductor +++ b/healthcheck/nova-conductor @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-conductor' args="${@:-5671 5672}" diff --git a/healthcheck/nova-consoleauth b/healthcheck/nova-consoleauth index 60088f589..4b453f15c 100644 --- a/healthcheck/nova-consoleauth +++ b/healthcheck/nova-consoleauth @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-consoleauth' args="${@:-5671 5672}" diff --git a/healthcheck/nova-ironic b/healthcheck/nova-ironic index ff2f703a4..24c412a7a 100644 --- a/healthcheck/nova-ironic +++ b/healthcheck/nova-ironic @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-compute' args="${@:-5671 5672}" diff --git a/healthcheck/nova-scheduler b/healthcheck/nova-scheduler index 21d9d9f62..602fa6d71 100644 --- a/healthcheck/nova-scheduler +++ b/healthcheck/nova-scheduler @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-scheduler' args="${@:-5671 5672}" diff --git a/healthcheck/nova-vnc-proxy b/healthcheck/nova-vnc-proxy index 143112c42..a187b96a3 100644 --- a/healthcheck/nova-vnc-proxy +++ b/healthcheck/nova-vnc-proxy @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='nova-novncproxy' args="${@:-5671 5672}" diff --git a/healthcheck/octavia-health-manager b/healthcheck/octavia-health-manager index 6e2cc2289..ac62e04f5 100644 --- a/healthcheck/octavia-health-manager +++ b/healthcheck/octavia-health-manager @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='octavia-health-manager' args="${@:-5671 5672}" diff --git a/healthcheck/octavia-housekeeping b/healthcheck/octavia-housekeeping index db0b9918c..855b80055 100644 --- a/healthcheck/octavia-housekeeping +++ b/healthcheck/octavia-housekeeping @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='octavia-housekeeping' args="${@:-5671 5672}" diff --git a/healthcheck/octavia-worker b/healthcheck/octavia-worker index 80e89d8bc..6b2777bd0 100644 --- a/healthcheck/octavia-worker +++ b/healthcheck/octavia-worker @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='octavia-worker' args="${@:-5671 5672}" diff --git a/healthcheck/sahara-engine b/healthcheck/sahara-engine index 459289705..f22eb7981 100644 --- a/healthcheck/sahara-engine +++ b/healthcheck/sahara-engine @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='sahara-engine' args="${@:-5671 5672}" diff --git a/healthcheck/sensu-client b/healthcheck/sensu-client index 8998efa8d..cfcbc8a5c 100644 --- a/healthcheck/sensu-client +++ b/healthcheck/sensu-client @@ -1,6 +1,6 @@ #!/bin/bash -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh process='sensu-client' args="${@:-5671 5672}" diff --git a/healthcheck/swift-account-server b/healthcheck/swift-account-server index 496f8754b..bdaf6a401 100755 --- a/healthcheck/swift-account-server +++ b/healthcheck/swift-account-server @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh conf=/etc/swift/account-server.conf diff --git a/healthcheck/swift-container-server b/healthcheck/swift-container-server index 63df1bd29..f1a96128c 100755 --- a/healthcheck/swift-container-server +++ b/healthcheck/swift-container-server @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh conf=/etc/swift/container-server.conf diff --git a/healthcheck/swift-object-server b/healthcheck/swift-object-server index 3c54dcfa9..1803625cd 100755 --- a/healthcheck/swift-object-server +++ b/healthcheck/swift-object-server @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh conf=/etc/swift/object-server.conf diff --git a/healthcheck/swift-proxy b/healthcheck/swift-proxy index bb5ef8066..1e903d84c 100755 --- a/healthcheck/swift-proxy +++ b/healthcheck/swift-proxy @@ -1,6 +1,6 @@ #!/bin/sh -. ${HEALTHCHECK_SCRIPTS:-/usr/share/tripleo-common/healthcheck}/common.sh +. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh conf=/etc/swift/proxy-server.conf