Merge "nova: Remove nova-placement images and healthchecks"
This commit is contained in:
commit
bd65d1c9a6
|
@ -141,8 +141,6 @@ container_images:
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
|
- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: docker.io/tripleomaster/centos-binary-nova-placement-api:current-tripleo
|
|
||||||
image_source: kolla
|
|
||||||
- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
|
- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo
|
- imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo
|
||||||
|
|
|
@ -614,14 +614,6 @@ container_images_template:
|
||||||
services:
|
services:
|
||||||
- OS::TripleO::Services::NovaVncProxy
|
- OS::TripleO::Services::NovaVncProxy
|
||||||
|
|
||||||
- imagename: "{{namespace}}/{{name_prefix}}nova-placement-api{{name_suffix}}:{{tag}}"
|
|
||||||
image_source: kolla
|
|
||||||
params:
|
|
||||||
- DockerNovaPlacementConfigImage
|
|
||||||
- DockerNovaPlacementImage
|
|
||||||
services:
|
|
||||||
- OS::TripleO::Services::NovaPlacement
|
|
||||||
|
|
||||||
- imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}"
|
- imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}"
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
params:
|
params:
|
||||||
|
|
|
@ -578,12 +578,6 @@ RUN mkdir -p /openstack && \
|
||||||
chmod a+rx /openstack/healthcheck
|
chmod a+rx /openstack/healthcheck
|
||||||
{% endblock %}
|
{% 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_api_footer %}
|
{% block octavia_api_footer %}
|
||||||
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
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 \
|
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
|
||||||
|
|
||||||
check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-placement_wsgi.conf)
|
|
||||||
healthcheck_curl ${check_url}
|
|
Loading…
Reference in New Issue