Add octavia docker image
Change-Id: I6dc827cc1bbea9d580e1dcdb1396f7f9848530ca Implements: blueprint lbaas-octavia-driver
This commit is contained in:
Jeffrey Zhang
Jeffrey Zhang
parent
93f934c1d6
commit
2d8be6bee4
|
|
@ -0,0 +1,25 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
{% block octavia_api_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set octavia_api_packages = [
|
||||
'openstack-octavia-api'
|
||||
] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(octavia_api_packages | customizable("packages")) }}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block octavia_api_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER octavia
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
{% block octavia_base_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set octavia_base_packages = [
|
||||
'openstack-octavia-common'
|
||||
] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
|
||||
|
||||
{% elif install_type == 'source' %}
|
||||
ADD octavia-base-archive /octavia-base-source
|
||||
RUN ln -s /octavia-base-source/* octavia \
|
||||
&& useradd --user-group --create-home --home-dir /var/lib/octavia octavia \
|
||||
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /octavia \
|
||||
&& mkdir -p /etc/octavia \
|
||||
&& cp -r /octavia/etc/* /etc/octavia/ \
|
||||
&& chown -R octavia: /etc/octavia
|
||||
{% endif %}
|
||||
|
||||
{% block octavia_base_footer %}{% endblock %}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
{% block octavia_health_manager_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set octavia_health_manager_packages = [
|
||||
'openstack-octavia-health-manager'
|
||||
] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block octavia_health_manager_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER octavia
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
{% block octavia_housekeeping_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set octavia_housekeeping_packages = [
|
||||
'openstack-octavia-housekeeping'
|
||||
] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block octavia_housekeeping_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER octavia
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
{% block octavia_worker_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
{% set octavia_worker_packages = [
|
||||
'openstack-octavia-worker'
|
||||
] %}
|
||||
{% elif base_distro in ['ubuntu'] %}
|
||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
||||
&& /bin/false
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(octavia_worker_packages | customizable("packages")) }}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% block octavia_worker_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER octavia
|
||||
|
|
@ -48,8 +48,8 @@ _PROFILE_OPTS = [
|
|||
default=['aodh', 'cloudkitty', 'congress', 'designate',
|
||||
'freezer', 'gnocchi', 'influxdb', 'ironic', 'karbor',
|
||||
'kuryr', 'magnum', 'manila', 'mistral', 'murano',
|
||||
'panko', 'rally', 'sahara', 'searchlight', 'senlin',
|
||||
'solum', 'telegraf', 'trove', 'zaqar'],
|
||||
'octavia', 'panko', 'rally', 'sahara', 'searchlight',
|
||||
'senlin', 'solum', 'telegraf', 'trove', 'zaqar'],
|
||||
help='Aux Images'),
|
||||
cfg.ListOpt('default',
|
||||
default=['chrony', 'cron', 'kolla-toolbox', 'glance',
|
||||
|
|
@ -286,6 +286,10 @@ SOURCES = {
|
|||
'type': 'url',
|
||||
'location': ('http://github.com/kanaka/noVNC/tarball/'
|
||||
'v0.5.1')},
|
||||
'octavia-base': {
|
||||
'type': 'url',
|
||||
'location': ('http://tarballs.openstack.org/octavia/'
|
||||
'octavia-master.tar.gz')},
|
||||
'panko-base': {
|
||||
'type': 'url',
|
||||
'location': ('http://tarballs.openstack.org/panko/'
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
|
|||
class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
|
||||
excluded_images = ["karbor-base",
|
||||
"kuryr-base",
|
||||
"octavia-base",
|
||||
"neutron-sfc-agent",
|
||||
"searchlight-base",
|
||||
"senlin-base",
|
||||
|
|
|
|||
Loading…
Reference in New Issue