diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-22 13:13:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-22 13:13:37 +0000 |
| commit | 7ec4a4c8aecff1c5e3b04c2ad2145fcd6bdd63bd (patch) | |
| tree | c403d47c543e0cca296c0444354e1961a78a5e66 | |
| parent | be544f4e66a6d0dbaa0c26e4565ccfe6a2548838 (diff) | |
| parent | dcdb0472fa2b1a17b360c325d7d7609dbc598955 (diff) | |
| download | kolla-7ec4a4c8aecff1c5e3b04c2ad2145fcd6bdd63bd.tar.gz kolla-7ec4a4c8aecff1c5e3b04c2ad2145fcd6bdd63bd.zip | |
Merge "Build Masakari for Debian binary"
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 2 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/masakari-debian-binary-0c50d50c2c3f836d.yaml | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 7ccb90898..040f62975 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -39,7 +39,7 @@ logstash,C,C,C,C,N,C magnum,C,C,C,C,N,C manila,C,C,C,C,N,C mariadb,C,C,C,C,N,C -masakari,N,C,C,C,N,C +masakari,N,C,C,C,C,C memcached,C,C,C,C,N,C mistral,C,C,C,C,N,C monasca,N,N,N,N,N,N diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index aa92c4491..42b41f21b 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -40,7 +40,7 @@ logstash,C,C,C,C,C,C magnum,C,C,C,C,C,C manila,C,C,C,C,C,C mariadb,T,T,T,T,C,T -masakari,N,T,C,T,N,C +masakari,N,T,C,T,C,C memcached,T,T,T,T,C,C mistral,C,T,N,C,C,C monasca,N,C,N,C,N,N diff --git a/kolla/image/build.py b/kolla/image/build.py index f2c4b1a95..2d0c92303 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -164,7 +164,6 @@ UNBUILDABLE_IMAGES = { 'debian+binary': { "cloudkitty-base", "ironic-neutron-agent", - "masakari-base", "nova-serialproxy", "senlin-conductor", # no binary package "senlin-health-manager", # no binary package diff --git a/releasenotes/notes/masakari-debian-binary-0c50d50c2c3f836d.yaml b/releasenotes/notes/masakari-debian-binary-0c50d50c2c3f836d.yaml new file mode 100644 index 000000000..9c81042d6 --- /dev/null +++ b/releasenotes/notes/masakari-debian-binary-0c50d50c2c3f836d.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Support for Debian binary (aka packaged) Masakari images. |