aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/base/Dockerfile.j210
-rw-r--r--docker/designate/designate-base/Dockerfile.j27
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j24
-rw-r--r--docker/heat/heat-api/Dockerfile.j24
-rw-r--r--docker/heat/heat-api/config-external.sh4
-rwxr-xr-xdocker/heat/heat-api/start.sh10
-rw-r--r--docker/ironic/ironic-base/Dockerfile.j22
-rw-r--r--docker/keystone/Dockerfile.j21
-rw-r--r--docker/kolla-ansible/Dockerfile.j28
9 files changed, 28 insertions, 22 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b3b0c776a..602555c85 100755
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -65,6 +65,7 @@ RUN yum install -y \
git \
iproute \
mariadb-libs \
+ MySQL-python \
openssl \
openstack-utils \
pyparsing \
@@ -108,6 +109,7 @@ RUN yum install -y \
python-netifaces \
python-networkx \
python-oauthlib \
+ python-openstackclient \
python-oslo-config \
python-oslo-messaging \
python-oslo-rootwrap \
@@ -173,7 +175,6 @@ RUN yum update -y \
libxslt-devel \
mariadb-devel \
mysql-devel \
- MySQL-python \
openldap-devel \
openssl \
openssl-devel \
@@ -210,7 +211,6 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
build-essential \
python-dev \
libssl-dev \
- python-mysqldb \
libmariadbclient-dev \
libxslt1-dev \
libffi-dev \
@@ -228,7 +228,11 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
- && rm get-pip.py
+ && rm get-pip.py \
+ && pip --no-cache-dir install \
+ python-openstackclient \
+ MySQL-python \
+ numpy
# Endif for install_type source
{% endif %}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 3fec3a6f7..4272ca7e7 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -9,10 +9,9 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
# need the complete policy file because of some of the containers'
# requiring it. Remove the package when the file is moved though.
RUN yum install -y \
- MySQL-python \
- openstack-designate-api \
- openstack-designate-common \
- python-tooz \
+ openstack-designate-api \
+ openstack-designate-common \
+ python-tooz \
&& yum clean all \
&& cp /etc/designate/policy.json /tmp/ \
&& rpm -e openstack-designate-api \
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index f199c16cf..0e0b09907 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -4,9 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-RUN yum -y install \
- openstack-heat-api-cfn \
- python-openstackclient \
+RUN yum -y install openstack-heat-api-cfn \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 8a782d8d3..25cbcf9f5 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -4,9 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-RUN yum -y install \
- openstack-heat-api \
- python-openstackclient \
+RUN yum -y install openstack-heat-api \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/heat/heat-api/config-external.sh b/docker/heat/heat-api/config-external.sh
index ca5d73e90..2da92b203 100644
--- a/docker/heat/heat-api/config-external.sh
+++ b/docker/heat/heat-api/config-external.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-SOURCE="/opt/kolla/heat-api/heat-api.conf"
-TARGET="/etc/heat/heat-api.conf"
+SOURCE="/opt/kolla/heat-api/heat.conf"
+TARGET="/etc/heat/heat.conf"
OWNER="heat"
if [[ -f "$SOURCE" ]]; then
diff --git a/docker/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh
index a7b14b1d9..25bfa2bff 100755
--- a/docker/heat/heat-api/start.sh
+++ b/docker/heat/heat-api/start.sh
@@ -10,4 +10,14 @@ source /opt/kolla/kolla-common.sh
# Execute config strategy
set_configs
+# 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
+ su -s /bin/sh -c "heat-manage db_sync" heat
+ openstack domain create heat_user_domain
+ openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
+ openstack role add --domain heat_user_domain --user heat_domain_admin admin
+ exit 0
+fi
+
exec $CMD $ARGS
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index 0fc7e56c2..29789429e 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -6,12 +6,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
# until packaging is fixed, all of this is required
# api: policy
-# conductor:MySQL-python
RUN yum -y install \
python-oslo-log \
python-oslo-concurrency \
python-oslo-policy \
- MySQL-python \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index db5292399..e71d7dfb9 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -6,7 +6,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-keystone \
python-keystoneclient \
- python-openstackclient \
httpd \
mod_wsgi \
&& yum clean all
diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2
index 9975f5873..9b84c761e 100644
--- a/docker/kolla-ansible/Dockerfile.j2
+++ b/docker/kolla-ansible/Dockerfile.j2
@@ -9,7 +9,6 @@ RUN yum -y install \
libffi-devel \
libxml2-devel \
libxslt-devel \
- MySQL-python \
openssl-devel \
python-devel \
openssh-clients \
@@ -19,16 +18,17 @@ RUN pip install -U pip wheel
{% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends git
+RUN apt-get install -y --no-install-recommends git \
+ && apt-get clean
{% endif %}
-RUN pip install shade
+RUN pip --no-cache-dir install shade
RUN git clone --depth 1 https://github.com/ansible/ansible.git \
&& cd ansible \
&& git submodule update --init --recursive \
- && pip install --install-option="--install-scripts=/usr/bin" .
+ && pip --no-cache-dir install .
RUN mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local' > /etc/ansible/hosts
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 19:15:03 +0000