Postgresql UC Python and Ubuntu upgrade.

This Patchset updates ubuntu from xenial to Bionic,
     and Python from 2.0 to 3.7.

Change-Id: Id79cb21eec820f6505b0287616ed399c1898da4b
This commit is contained in:
diwakar thyagaraj 2019-12-12 22:42:35 +00:00
parent 31ec6ac551
commit d551da949d
5 changed files with 10 additions and 11 deletions

View File

@ -23,7 +23,7 @@ root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl
These lines will get rid of duplicate logs, generated because of the formatter
attached by oslo-rootwrap.
*/}}
sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
{{/*
Copyright 2017 The Openstack-Helm Authors.

View File

@ -25,7 +25,7 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
postgresql_utility: 'quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_xenial'
postgresql_utility: 'quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic'
image_repo_sync: docker.io/docker:18.09.02
local_registry:
active: false

View File

@ -1,4 +1,4 @@
ARG FROM=ubuntu:16.04
ARG FROM=ubuntu:18.04
FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -19,13 +19,12 @@ RUN set -xe && \
moreutils \
postgresql-client \
postgresql-common \
python-oslo.rootwrap \
python3-pip \
python3-oslo.rootwrap \
rsyslog \
screen \
sudo && \
apt-get clean -y && \
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* \
/var/log/* /tmp/* /var/tmp/*
rm -rf /var/cache/debconf/* /var/lib/apt/lists/*
CMD ["/bin/bash"]

View File

@ -17,7 +17,7 @@
parent: &parent airship-porthole-images
vars:
image_name: &image_name porthole-postgresql-utility
distro_suffix: &distro_suffix ubuntu_xenial
distro_suffix: &distro_suffix ubuntu_bionic
files:
- ^charts/postgresql-utility/.*$
- ^images/postgresql-utility/.*$