airship/porthole
Code Issues Proposed changes

Postgresql UC Python and Ubuntu upgrade.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charts/postgresql-utility/templates/bin/_start.sh.tpl
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 These lines will get rid of duplicate logs, generated because of the formatter
attached by oslo-rootwrap. attached by oslo-rootwrap.
*/}} */}}
sed -i "/rootwrap_logger.setLevel/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/python2.7/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/python2.7/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/python2.7/dist-packages/oslo_rootwrap/wrapper.py sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py

2
charts/postgresql-utility/templates/bin/utility/_postgresql-utility-rootwrap.tpl
View File

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

2
charts/postgresql-utility/values.yaml
View File

@ -25,7 +25,7 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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 image_repo_sync: docker.io/docker:18.09.02
local_registry: local_registry:
active: false active: false

7
images/postgresql-utility/Dockerfile.ubuntu_xenial → images/postgresql-utility/Dockerfile.ubuntu_bionic
View File

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

2
zuul.d/postgresql-utility.yaml
View File

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