diff options
| author | gugug <gu.jin@99cloud.net> | 2020-06-14 14:01:14 +0800 |
|---|---|---|
| committer | caoyuan <cao.yingjunz@gmail.com> | 2020-06-20 01:50:16 +0000 |
| commit | e364113adcb529cc06575133b0e377526516f715 (patch) | |
| tree | 2a501a2f95fe367bc7b32b38382853d60dccd7cf | |
| parent | 504ec3b511914107034fc0cb7a8f0acb9974fc58 (diff) | |
| download | kolla-e364113adcb529cc06575133b0e377526516f715.tar.gz kolla-e364113adcb529cc06575133b0e377526516f715.zip | |
Remove mongodb dockerfile from kolla
more info: https://opendev.org/openstack/kolla-ansible/commit/a6c97d7284c7de437ebfc9f8ee289244f29e65d7
Change-Id: I9e8a973e10389d42d6fedffb98bd23f1a8271087
Co-Authored-By: jacky06 <zhang.min@99cloud.net>
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | docker/mongodb/Dockerfile.j2 | 35 | ||||
| -rw-r--r-- | docker/mongodb/extend_start.sh | 18 | ||||
| -rw-r--r-- | docker/mongodb/mongodb_sudoers | 1 | ||||
| -rwxr-xr-x | kolla/common/config.py | 3 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/remove-mongodb-image-d5d2c4c6463b2ecd.yaml | 3 |
7 files changed, 4 insertions, 61 deletions
diff --git a/README.rst b/README.rst index 421faa023..ce467785b 100644 --- a/README.rst +++ b/README.rst @@ -148,7 +148,6 @@ Kolla provides images to deploy the following infrastructure components: - `MariaDB and Galera Cluster <https://mariadb.com/kb/en/library/galera-cluster/>`__ for highly available MySQL databases. - `Memcached <https://www.memcached.org/>`__ a distributed memory object caching system. -- `MongoDB <https://www.mongodb.org/>`__ as a database back end for Panko. - `Open vSwitch <https://www.openvswitch.org/>`__ and Linuxbridge back ends for Neutron. - `Linux ptp <http://linuxptp.sourceforge.net/>`__ an implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux. diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 deleted file mode 100644 index 1a41438e1..000000000 --- a/docker/mongodb/Dockerfile.j2 +++ /dev/null @@ -1,35 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block mongodb_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='mongodb') }} - -{% if base_package_type == 'rpm' %} - {% set mongodb_packages = [ - 'mongodb', - 'mongodb-server' - ] %} -{% elif base_package_type == 'deb' %} - {% set mongodb_packages = [ - 'mongodb-server' - ] %} -{% endif %} - -{{ macros.install_packages(mongodb_packages | customizable("packages")) }} - -COPY mongodb_sudoers /etc/sudoers.d/kolla_mongodb_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_mongodb_sudoers - -{% block mongodb_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER mongodb diff --git a/docker/mongodb/extend_start.sh b/docker/mongodb/extend_start.sh deleted file mode 100644 index 8d8933f90..000000000 --- a/docker/mongodb/extend_start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -echo "run extended start" - -if [[ ! -d "/var/log/kolla/mongodb" ]]; then - mkdir -p /var/log/kolla/mongodb -fi - -if [[ $(stat -c %a /var/log/kolla/mongodb) != "755" ]]; then - chmod 755 /var/log/kolla/mongodb -fi - -# 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 - sudo chown mongodb: /var/lib/mongodb/ - exit 0 -fi diff --git a/docker/mongodb/mongodb_sudoers b/docker/mongodb/mongodb_sudoers deleted file mode 100644 index 8a8f4e3cc..000000000 --- a/docker/mongodb/mongodb_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown mongodb\: /var/lib/mongodb/, /bin/chown mongodb\: /var/lib/mongodb/ diff --git a/kolla/common/config.py b/kolla/common/config.py index ff25270ab..8d90228e2 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -63,7 +63,6 @@ _PROFILE_OPTS = [ 'logstash', 'mariadb', 'memcached', - 'mongodb', 'opendaylight', 'openvswitch', 'ptp', @@ -949,7 +948,7 @@ USERS = { 'uid': 42431, 'gid': 42431, }, - 'mongodb-user': { + 'mongodb-user': { # unused user (mongodb dropped) 'uid': 42432, 'gid': 65534, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index e6d1a698c..5e79dffbb 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -129,7 +129,6 @@ UNBUILDABLE_IMAGES = { 'centos': { "hacluster-pcs", # Missing crmsh package - "mongodb", # Missing mongodb and mongodb-server packages "nova-spicehtml5proxy", # Missing spicehtml5 package "opendaylight", # Missing opendaylight repo "ovsdpdk", # Not supported on CentOS @@ -141,7 +140,6 @@ UNBUILDABLE_IMAGES = { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' "monasca-grafana", # FIXME(hrw): some ssl issues to fix - "mongodb", "opendaylight", # no binary package "ovsdpdk", "qdrouterd", @@ -168,7 +166,6 @@ UNBUILDABLE_IMAGES = { "influxdb", # no binary package "kibana", # no binary package "kolla-toolbox", # no Erlang package - "mongodb", # no binary package "rabbitmq", # no Erlang package "telegraf", # no binary package }, @@ -177,7 +174,6 @@ UNBUILDABLE_IMAGES = { "hacluster-pcs", # no binary package "influxdb", # no binary package "kibana", # no binary package - "mongodb", # no binary package }, 'debian+binary': { diff --git a/releasenotes/notes/remove-mongodb-image-d5d2c4c6463b2ecd.yaml b/releasenotes/notes/remove-mongodb-image-d5d2c4c6463b2ecd.yaml new file mode 100644 index 000000000..bd65b26a6 --- /dev/null +++ b/releasenotes/notes/remove-mongodb-image-d5d2c4c6463b2ecd.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - remove mongodb image from kolla, following deprecation process. |
