From b8f7693d41bcdef7f6f0af96f9fb31b74e7c7204 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Tue, 29 Aug 2017 22:44:14 +0200
Subject: Implement Almanach Docker images

Almanach record the utilization of OpenStack resources for each tenant.

Implements: blueprint containerized-almanach
Change-Id: Iba2e16772864a6f0169ec43d7a87d741882cd51c
---
 kolla/common/config.py | 9 +++++++++
 kolla/image/build.py   | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'kolla')

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 56910be96..c0e3b8867 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -95,6 +95,7 @@ _PROFILE_OPTS = [
                 help='Main images'),
     cfg.ListOpt('aux',
                 default=[
+                    'almanach',
                     'aodh',
                     'blazar',
                     'cloudkitty',
@@ -278,6 +279,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/requirements/'
                      'requirements-master.tar.gz')},
+    'almanach-base': {
+        'type': 'url',
+        'location': ('$tarballs_base/almanach/'
+                     'almanach-master.tar.gz')},
     'aodh-base': {
         'type': 'url',
         'location': ('$tarballs_base/aodh/'
@@ -946,6 +951,10 @@ USERS = {
     'fluentd-user': {
         'uid': 42474,
         'gid': 42474,
+    },
+    'almanach-user': {
+        'uid': 42475,
+        'gid': 42475,
     }
 }
 
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 94b72eff1..6af8f24aa 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -96,6 +96,7 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR,
 
 SKIPPED_IMAGES = {
     'centos+binary': [
+        "almanach-base",
         "bifrost-base",
         "blazar-base",
         "dragonflow-base",
@@ -117,6 +118,7 @@ SKIPPED_IMAGES = {
         "ovsdpdk",
     ],
     'ubuntu+binary': [
+        "almanach-base",
         "bifrost-base",
         "blazar-base",
         "cloudkitty-base",
@@ -145,6 +147,7 @@ SKIPPED_IMAGES = {
         "tripleo-ui"
     ],
     'debian+binary': [
+        "almanach-base",
         "bifrost-base",
         "blazar-base",
         "cloudkitty-base",
@@ -175,6 +178,7 @@ SKIPPED_IMAGES = {
         "tripleo-ui"
     ],
     'oraclelinux+binary': [
+        "almanach-base",
         "bifrost-base",
         "blazar-base",
         "dragonflow-base",
-- 
cgit v1.2.3