summaryrefslogtreecommitdiffstats
path: root/doctor_tests/admin_tool
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2019-11-07 13:09:45 +0200
committerTomi Juvonen <tomi.juvonen@nokia.com>2019-11-19 06:58:07 +0000
commita0528f67abe01f0bb4be3565cfef4fd049afa1fa (patch)
tree04b542e405e951067a8a65b09ce8a0e6ebf7e09b /doctor_tests/admin_tool
parente961ab783887a9c44d2a321df646f1c49f83b299 (diff)
Maintenance support for latest Fenix, python3 and Fuel
JIRA: DOCTOR-134 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com> Change-Id: I51a93637f30b0eece2075a8277616fb97a1b230e
Diffstat (limited to 'doctor_tests/admin_tool')
-rw-r--r--doctor_tests/admin_tool/fenix/Dockerfile27
-rwxr-xr-xdoctor_tests/admin_tool/fenix/run6
2 files changed, 17 insertions, 16 deletions
diff --git a/doctor_tests/admin_tool/fenix/Dockerfile b/doctor_tests/admin_tool/fenix/Dockerfile
index 90039b0d..5804b207 100644
--- a/doctor_tests/admin_tool/fenix/Dockerfile
+++ b/doctor_tests/admin_tool/fenix/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/alpine:3.5
+FROM gliderlabs/alpine:3.6
ARG BRANCH=master
ARG OPENSTACK=master
@@ -11,23 +11,24 @@ RUN echo "Building Fenix container against OpenStack $OPENSTACK" && \
mkdir -p /var/tmp/fenix
WORKDIR /var/tmp/fenix
COPY fenix*.conf /etc/fenix/
+
RUN apk --no-cache add ca-certificates && \
apk --no-cache add --update python3 sshpass py-pip git curl && \
apk --no-cache add --virtual .build-deps --update \
- python-dev python3-dev build-base linux-headers libffi-dev \
+ python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
- curl https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK > upper-constraints.txt && \
- pip install --upgrade pip && \
- pip install alembic aodhclient ast decorator \
- eventlet flask Flask-RESTful importlib \
- keystoneauth1 logging python-novaclient oslo.config oslo.db \
- oslo.log oslo.messaging oslo.serialization oslo.service \
- oslotest oslo.utils pbr pymysql setuptools six sqlalchemy \
- wsgiref -cupper-constraints.txt && \
- git clone https://git.openstack.org/openstack/fenix -b $BRANCH /fenix && \
+ curl https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK/upper-constraints.txt > upper-constraints.txt && \
+ if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
+ if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
+ pip3 install --upgrade pip && \
+ pip3 install alembic aodhclient decorator flask Flask-RESTful eventlet \
+ keystoneauth1 keystonemiddleware python-novaclient oslo.config pecan \
+ oslo.db oslo.log oslo.messaging oslo.serialization oslo.service oslo_policy \
+ oslotest oslo.utils pbr pymysql six sqlalchemy -cupper-constraints.txt && \
+ git clone https://opendev.org/x/fenix -b $BRANCH /fenix && \
rm -fr /var/tmp/fenix
COPY run /fenix
-COPY overcloudrc /fenix
+COPY keystonercv3 /fenix
WORKDIR /fenix
-RUN python setup.py install
+RUN python3 setup.py install
CMD ./run
diff --git a/doctor_tests/admin_tool/fenix/run b/doctor_tests/admin_tool/fenix/run
index 2a2e37cd..50ae68e7 100755
--- a/doctor_tests/admin_tool/fenix/run
+++ b/doctor_tests/admin_tool/fenix/run
@@ -1,8 +1,8 @@
#!/bin/sh
-. overcloudrc
+. keystonercv3
# Start the first process
-nohup python /fenix/fenix/cmd/engine.py > /var/log/fenix-engine.log&
+nohup python3 /fenix/fenix/cmd/engine.py > /var/log/fenix-engine.log&
status=$?
if [ $status -ne 0 ]; then
echo "Failed to start engine.py: $status"
@@ -10,7 +10,7 @@ if [ $status -ne 0 ]; then
fi
# Start the second process
-nohup python /fenix/fenix/cmd/api.py > /var/log/fenix-api.log&
+nohup python3 /fenix/fenix/cmd/api.py > /var/log/fenix-api.log&
status=$?
if [ $status -ne 0 ]; then
echo "Failed to start api.py: $status"