airship/porthole
Code Issues Proposed changes

Compute UC python and Ubuntu upgrade.

Browse Source 
This Patchset updated Ubuntu to  Bionic
and Python from 2.0 to 3.0.

Change-Id: Ife0b2041c6c5c8935eb11d9157f39a217b130ae1
This commit is contained in:
Prateek Dodda 2019-12-05 12:40:57 -06:00 committed by Sreejith Punnapuzha
parent c8afd0480b
commit 9c2038cb59
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
charts/compute-utility/templates/bin/_start.sh.tpl
View File

@ -23,10 +23,10 @@ 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
# for readiness probe
touch /tmp/done

2
charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl
View File

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

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

@ -27,7 +27,7 @@ release_uuid: null
images:
pull_policy: IfNotPresent
tags:
compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_xenial'
compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_bionic'
image_repo_sync: docker.io/docker:18.09.02
local_registry:
active: false

8
images/compute-utility/Dockerfile.ubuntu_xenial → images/compute-utility/Dockerfile.ubuntu_bionic
View File

@ -1,4 +1,4 @@
ARG FROM=docker.io/ubuntu:xenial
ARG FROM=docker.io/ubuntu:bionic
FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -10,6 +10,8 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
ARG KUBE_VERSION=1.12.2
ARG DEBIAN_FRONTEND=noninteractive
RUN set -xe \
&& sed -i '/nobody/d' /etc/passwd \
&& echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
@ -23,7 +25,9 @@ RUN set -xe \
iperf \
jq \
moreutils \
python-oslo.rootwrap \
python3 \
python3-pip \
python3-oslo.rootwrap \
radosgw \
rsyslog \
s3cmd \

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

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