From f4097518686f79528a64f23376a8c5611ed46009 Mon Sep 17 00:00:00 2001 From: aimbot31 Date: Tue, 6 Aug 2019 14:31:40 +0200 Subject: [PATCH] Fixed a dependency and added a directory for the config In order to have compatibility between CloudKitty and Kubernetes, we need to have a repository for processing the ConfigMap. There where a problem with PyMySQL which where missing. Updated the readme to explain where to put the config --- CloudKitty/api/Dockerfile | 8 +++++--- CloudKitty/processor/Dockerfile | 2 +- README.md | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CloudKitty/api/Dockerfile b/CloudKitty/api/Dockerfile index 8b5f7cd..8007b7e 100644 --- a/CloudKitty/api/Dockerfile +++ b/CloudKitty/api/Dockerfile @@ -1,13 +1,15 @@ FROM python:3.7-slim-buster -RUN apt-get update \ +RUN apt-get update \ && apt-get install --no-install-recommends -y \ apache2 \ libapache2-mod-wsgi-py3 \ gcc \ python3-dev \ - && pip install cloudkitty \ - && mkdir /etc/cloudkitty \ + && pip install cloudkitty PyMySQL \ + && mkdir \ + /etc/cloudkitty \ + /etc/cloudkitty-config \ && apt-get purge -y \ gcc \ python3-dev \ diff --git a/CloudKitty/processor/Dockerfile b/CloudKitty/processor/Dockerfile index 1344d7e..a2179e6 100644 --- a/CloudKitty/processor/Dockerfile +++ b/CloudKitty/processor/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.7-buster -RUN pip install cloudkitty +RUN pip install cloudkitty PyMySQL CMD [ "cloudkitty-processor" ] \ No newline at end of file diff --git a/README.md b/README.md index c1b4f60..1a98967 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,13 @@ This repository contains the Dockerfiles for Objectif Libre's official images. ## CloudKitty +If you wish to configure CloudKitty, the configuration files are located here : + +- `/etc/cloudkitty/metrics.yml` +- `/etc/cloudkitty/cloudkitty.conf` + +Please, refer to the [documentation of cloudkitty](https://docs.openstack.org/cloudkitty/latest/admin/configuration/configuration.html) if you don't know how to use theses files. + ### api Contains the Dockerfile for CloudKitty's API and its dependencies.