aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/magnum/magnum-base/Dockerfile.j23
-rw-r--r--releasenotes/notes/add-magnum-cluster-api-0b82789def334eb8.yaml5
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 71e6a507c..a79690351 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -12,7 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
ADD magnum-base-archive /magnum-base-source
{% set magnum_base_pip_packages = [
- '/magnum[osprofiler]'
+ '/magnum[osprofiler]',
+ 'magnum-cluster-api'
] %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
diff --git a/releasenotes/notes/add-magnum-cluster-api-0b82789def334eb8.yaml b/releasenotes/notes/add-magnum-cluster-api-0b82789def334eb8.yaml
new file mode 100644
index 000000000..f6818e838
--- /dev/null
+++ b/releasenotes/notes/add-magnum-cluster-api-0b82789def334eb8.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - The ``magnum-cluster-api`` driver has been added to the Kolla images for
+ Magnum. This driver allows Magnum to create Kubernetes clusters using the
+ Cluster API project.