repair aodh image dockerfile
1. Add the missing packages in the aodh image packages: pymongo 2. Add aodh sudoer 3. aodh sync db command is error sync db command is: aodh-dbsync Reference link: http://docs.openstack.org/developer/aodh/install/manual.html 4. Add aodh-api running as a mod_wsgi Reference link: http://docs.openstack.org/developer/aodh/install/mod_wsgi.html Closes-Bug: #1609000 Change-Id: Ia3706794059231fa08444e32eb034d64fbfa5182
This commit is contained in:
zhubingbing
parent
1e222274e1
commit
56838a347e
@ -17,5 +17,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
|
||||
{% block aodh_api_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
{{ include_footer }}
|
||||
|
||||
USER aodh
|
||||
|
||||
@ -1,8 +1,18 @@
|
||||
#!/bin/bash
|
||||
|
||||
# NOTE(pbourke): httpd will not clean up after itself in some cases which
|
||||
# results in the container not being able to restart. (bug #1489676, 1557036)
|
||||
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
|
||||
# Loading Apache2 ENV variables
|
||||
. /etc/apache2/envvars
|
||||
rm -rf /var/run/apache2/*
|
||||
else
|
||||
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
|
||||
fi
|
||||
|
||||
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
|
||||
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
||||
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
||||
aodh-manage db_sync
|
||||
aodh-dbsync
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@ -4,27 +4,81 @@ MAINTAINER {{ maintainer }}
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
|
||||
|
||||
{% set aodh_base_packages = [
|
||||
'openstack-aodh-common',
|
||||
'python-aodhclient',
|
||||
'httpd',
|
||||
'mod_wsgi',
|
||||
'python-ldappool'
|
||||
] %}
|
||||
|
||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||
{% set aodh_base_packages = ['openstack-aodh-common'] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
{% set aodh_base_packages = ['aodh-common'] %}
|
||||
{% endif %}
|
||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||
RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||
&& cp -a /usr/lib/python2.7/site-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
|
||||
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
|
||||
{% set aodh_base_packages = [
|
||||
'aodh-common',
|
||||
'apache2',
|
||||
'libapache2-mod-wsgi',
|
||||
'python-ldappool'
|
||||
] %}
|
||||
|
||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||
RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||
&& cp -a /usr/lib/python2.7/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
|
||||
&& echo > /etc/apache2/ports.conf
|
||||
{% endif %}
|
||||
|
||||
{% elif install_type == 'source' %}
|
||||
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
|
||||
|
||||
{% set aodh_base_packages = [
|
||||
'httpd',
|
||||
'mod_wsgi',
|
||||
'python-ldappool'
|
||||
] %}
|
||||
|
||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||
RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
|
||||
{% elif base_distro in ['ubuntu', 'debian'] %}
|
||||
|
||||
{% set aodh_base_packages = [
|
||||
'apache2',
|
||||
'libapache2-mod-wsgi',
|
||||
'python-ldappool'
|
||||
] %}
|
||||
|
||||
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
||||
RUN mkdir -p /var/www/cgi-bin/aodh \
|
||||
&& echo > /etc/apache2/ports.conf
|
||||
{% endif %}
|
||||
|
||||
ADD aodh-base-archive /aodh-base-source
|
||||
|
||||
RUN ln -s aodh-base-source/* aodh \
|
||||
&& useradd --user-group aodh \
|
||||
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /aodh \
|
||||
&& mkdir -p /etc/aodh /var/log/aodh /home/aodh \
|
||||
&& cp -r /aodh/etc/* /etc/aodh/ \
|
||||
&& chown -R aodh: /etc/aodh /var/log/aodh /home/aodh
|
||||
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pymongo /aodh \
|
||||
&& mkdir -p /etc/aodh /var/log/kolla/aodh /var/www/cgi-bin/aodh /home/aodh \
|
||||
&& cp -r /aodh/etc/aodh/* /etc/aodh/ \
|
||||
&& cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
|
||||
&& chown -R aodh: /etc/aodh /var/log/kolla/aodh /var/www/cgi-bin/aodh /home/aodh
|
||||
|
||||
{% endif %}
|
||||
|
||||
RUN usermod -a -G kolla aodh
|
||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||
COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
|
||||
|
||||
RUN usermod -a -G kolla aodh \
|
||||
&& chmod 750 /etc/sudoers.d \
|
||||
&& chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
|
||||
&& chmod 755 /var/www/cgi-bin/aodh \
|
||||
&& touch /usr/local/bin/kolla_aodh_extend_start \
|
||||
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
|
||||
|
||||
{% block aodh_base_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
1
docker/aodh/aodh-base/aodh_sudoers
Normal file
1
docker/aodh/aodh-base/aodh_sudoers
Normal file
@ -0,0 +1 @@
|
||||
%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R aodh\: /var/lib/aodh/, /bin/chown -R aodh\: /var/lib/aodh/
|
||||
15
docker/aodh/aodh-base/extend_start.sh
Executable file
15
docker/aodh/aodh-base/extend_start.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Create log dir for Aodh logs
|
||||
AODH_LOG_DIR="/var/log/kolla/aodh"
|
||||
if [[ ! -d "${AODH_LOG_DIR}" ]]; then
|
||||
mkdir -p ${AODH_LOG_DIR}
|
||||
fi
|
||||
if [[ $(stat -c %U:%G ${AODH_LOG_DIR}) != "aodh:kolla" ]]; then
|
||||
chown aodh:kolla ${AODH_LOG_DIR}
|
||||
fi
|
||||
if [[ $(stat -c %a ${AODH_LOG_DIR}) != "755" ]]; then
|
||||
chmod 755 ${AODH_LOG_DIR}
|
||||
fi
|
||||
|
||||
. /usr/local/bin/kolla_aodh_extend_start
|
||||
Loading…
Reference in New Issue
Block a user