aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ansible/roles/cinder/defaults/main.yml6
-rw-r--r--ansible/roles/cinder/tasks/bootstrap.yml3
-rw-r--r--ansible/roles/glance/defaults/main.yml4
-rw-r--r--ansible/roles/glance/tasks/bootstrap.yml3
-rw-r--r--ansible/roles/mariadb/defaults/main.yml4
-rw-r--r--ansible/roles/mariadb/tasks/bootstrap.yml3
-rw-r--r--ansible/roles/rabbitmq/defaults/main.yml4
-rw-r--r--ansible/roles/rabbitmq/tasks/bootstrap.yml3
-rw-r--r--docker/centos/binary/data/Dockerfile4
l---------docker/centos/binary/data/build1
-rw-r--r--docker/centos/binary/galera/Dockerfile3
-rw-r--r--docker/centos/binary/rabbitmq/Dockerfile3
-rw-r--r--docker/centos/source/data/Dockerfile4
l---------docker/centos/source/data/build1
-rwxr-xr-xdocker/common/galera/config-galera.sh9
-rw-r--r--docker/common/rabbitmq/config-rabbit.sh2
-rw-r--r--docker_templates/data/Dockerfile.j24
-rw-r--r--docker_templates/galera/Dockerfile.j26
-rw-r--r--docker_templates/rabbitmq/Dockerfile.j26
-rwxr-xr-xtools/init-runonce2
20 files changed, 52 insertions, 23 deletions
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index 6af5f7df8..3bb0081a2 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -28,6 +28,10 @@ cinder_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
cinder_api_tag: "{{ openstack_release }}"
cinder_api_image_full: "{{ cinder_api_image }}:{{ cinder_api_tag }}"
+cinder_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
+cinder_data_image_tag: "{{ openstack_release }}"
+cinder_data_image_full: "{{ cinder_data_image }}:{{ cinder_data_image_tag }}"
+
####################
# Openstack
@@ -41,4 +45,4 @@ cinder_logging_debug: "{{ openstack_logging_debug }}"
cinder_keystone_user: "cinder"
-openstack_cinder_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}" \ No newline at end of file
+openstack_cinder_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index e157ce5ec..9482b5649 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -40,8 +40,7 @@
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: cinder_data
- image: "{{ cinder_api_image_full }}"
- command: "/bin/sleep infinity"
+ image: "{{ cinder_data_image_full }}"
volumes: "/var/lib/cinder/"
- name: Starting Cinder bootstrap container
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index 15062b8df..0ebe84b2c 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -20,6 +20,10 @@ glance_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
glance_api_tag: "{{ openstack_release }}"
glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
+glance_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
+glance_data_image_tag: "{{ openstack_release }}"
+glance_data_image_full: "{{ glance_data_image }}:{{ glance_data_image_tag }}"
+
####################
# Openstack
diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index f8d3c6534..49d57f763 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/ansible/roles/glance/tasks/bootstrap.yml
@@ -40,8 +40,7 @@
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: glance_data
- image: "{{ glance_registry_image_full }}"
- command: "/bin/sleep infinity"
+ image: "{{ glance_data_image_full }}"
volumes: "/var/lib/glance/"
- name: Starting Glance bootstrap container
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 2be21a4bc..e2e6dd432 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -13,3 +13,7 @@ database_cluster_name: "openstack"
mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-galera"
mariadb_tag: "{{ openstack_release }}"
mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
+
+mariadb_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
+mariadb_data_tag: "{{ openstack_release }}"
+mariadb_data_image_full: "{{ mariadb_data_image }}:{{ mariadb_data_tag }}"
diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index f31153c02..e616cf7a5 100644
--- a/ansible/roles/mariadb/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -49,8 +49,7 @@
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: mariadb_data
- image: "{{ mariadb_image_full }}"
- command: "/bin/sleep infinity"
+ image: "{{ mariadb_data_image_full }}"
volumes: "/var/lib/mysql/"
- name: Starting MariaDB bootstrap container
diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml
index b3ae1e9ca..6cf3246bc 100644
--- a/ansible/roles/rabbitmq/defaults/main.yml
+++ b/ansible/roles/rabbitmq/defaults/main.yml
@@ -8,6 +8,10 @@ rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker
rabbitmq_tag: "{{ openstack_release }}"
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
+rabbitmq_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
+rabbitmq_data_tag: "{{ openstack_release }}"
+rabbitmq_data_image_full: "{{ rabbitmq_data_image }}:{{ rabbitmq_data_tag }}"
+
####################
# Message-Broker
diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml
index 97cba1164..233e2ee38 100644
--- a/ansible/roles/rabbitmq/tasks/bootstrap.yml
+++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml
@@ -20,8 +20,7 @@
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: rabbitmq_data
- image: "{{ rabbitmq_image_full }}"
- command: "/bin/sleep infinity"
+ image: "{{ rabbitmq_data_image_full }}"
volumes: "/var/lib/rabbitmq/"
- name: Starting RabbitMQ bootstrap container
diff --git a/docker/centos/binary/data/Dockerfile b/docker/centos/binary/data/Dockerfile
new file mode 100644
index 000000000..635918540
--- /dev/null
+++ b/docker/centos/binary/data/Dockerfile
@@ -0,0 +1,4 @@
+FROM centos
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+CMD /bin/sleep infinity
diff --git a/docker/centos/binary/data/build b/docker/centos/binary/data/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/data/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile
index e4171165b..9a21c3440 100644
--- a/docker/centos/binary/galera/Dockerfile
+++ b/docker/centos/binary/galera/Dockerfile
@@ -19,7 +19,8 @@ RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \
percona-xtrabackup \
pv \
tar \
- expect
+ expect \
+ && rm -rf /var/lib/mysql/*
COPY config-galera.sh /opt/kolla/config/
COPY config-external.sh /opt/kolla/
diff --git a/docker/centos/binary/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile
index 51197ca43..88894c3c7 100644
--- a/docker/centos/binary/rabbitmq/Dockerfile
+++ b/docker/centos/binary/rabbitmq/Dockerfile
@@ -5,7 +5,8 @@ RUN yum -y install \
hostname \
rabbitmq-server && \
yum clean all && \
- /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
+ /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management \
+ && rm -rf /var/lib/rabbitmq/*
COPY config-rabbit.sh config-external.sh /opt/kolla/
COPY start.sh /
diff --git a/docker/centos/source/data/Dockerfile b/docker/centos/source/data/Dockerfile
new file mode 100644
index 000000000..635918540
--- /dev/null
+++ b/docker/centos/source/data/Dockerfile
@@ -0,0 +1,4 @@
+FROM centos
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+CMD /bin/sleep infinity
diff --git a/docker/centos/source/data/build b/docker/centos/source/data/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/source/data/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/common/galera/config-galera.sh b/docker/common/galera/config-galera.sh
index 8aab3cfe1..42393377d 100755
--- a/docker/common/galera/config-galera.sh
+++ b/docker/common/galera/config-galera.sh
@@ -74,13 +74,8 @@ function configure_db {
}
function populate_db {
- if [[ $(ls /var/lib/mysql) == "" ]]; then
- echo "POPULATING NEW DB"
- mysql_install_db
- chown -R mysql: /var/lib/mysql
- else
- echo "DB ALREADY EXISTS"
- fi
+ mysql_install_db
+ chown -R mysql: /var/lib/mysql
}
function prepare_db {
diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh
index 6f2283c67..c87a2ab48 100644
--- a/docker/common/rabbitmq/config-rabbit.sh
+++ b/docker/common/rabbitmq/config-rabbit.sh
@@ -2,6 +2,6 @@
function set_rabbitmq_cookie {
echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
- chown rabbitmq: /var/lib/rabbitmq/.erlang.cookie
+ chown -R rabbitmq: /var/lib/rabbitmq
chmod 400 /var/lib/rabbitmq/.erlang.cookie
}
diff --git a/docker_templates/data/Dockerfile.j2 b/docker_templates/data/Dockerfile.j2
new file mode 100644
index 000000000..18933ef55
--- /dev/null
+++ b/docker_templates/data/Dockerfile.j2
@@ -0,0 +1,4 @@
+FROM {{ base_distro }}:{{ base_distro_tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+CMD /bin/sleep infinity
diff --git a/docker_templates/galera/Dockerfile.j2 b/docker_templates/galera/Dockerfile.j2
index 90975ddab..2d656053a 100644
--- a/docker_templates/galera/Dockerfile.j2
+++ b/docker_templates/galera/Dockerfile.j2
@@ -21,12 +21,16 @@ RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat
percona-xtrabackup \
pv \
tar \
- expect
+ expect \
+ && rm -rf /var/lib/mysql/*
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN ["/bin/false"]
+# TODO(sdake) when ubuntu support is implemented we will need a line
+# && rm -rf /var/lib/mysql/
+
{% endif %}
COPY config-galera.sh /opt/kolla/config/
diff --git a/docker_templates/rabbitmq/Dockerfile.j2 b/docker_templates/rabbitmq/Dockerfile.j2
index 63dc1ff3c..119a30317 100644
--- a/docker_templates/rabbitmq/Dockerfile.j2
+++ b/docker_templates/rabbitmq/Dockerfile.j2
@@ -6,14 +6,16 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
hostname \
rabbitmq-server \
- && yum clean all
+ && yum clean all \
+ && rm -rf /var/lib/rabbitmq/*
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
hostname \
rabbitmq-server \
- && apt-get clean
+ && apt-get clean \
+ && rm -rf /var/lib/rabbitmq/*
{% endif %}
diff --git a/tools/init-runonce b/tools/init-runonce
index e7727b82e..c0ffc5c4c 100755
--- a/tools/init-runonce
+++ b/tools/init-runonce
@@ -37,7 +37,7 @@ if ! [ -f "$IMAGE" ]; then
curl -L -o ./$IMAGE $IMAGE_URL/$IMAGE
fi
echo Creating glance image.
-glance image-create --name cirros --progress --disk-format qcow2 --container-format bare --visibility public --progress --file ./$IMAGE
+glance image-create --name cirros --progress --disk-format qcow2 --container-format bare --progress --file ./$IMAGE
if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then
echo Configuring nova networking.
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 20:59:19 +0000