aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorBai Yongjun <byj994@163.com>2018-11-22 22:27:02 +0800
committerTaeha Kim <kthguru@gmail.com>2019-03-27 16:19:13 +0000
commit265f643295efa50b8d5c7dc716353883d645c588 (patch)
tree649a7e668aabc7b789da61a920b6aef6815edb4b /kolla
parent09f37541d8e57d85aa568a0ad6a23c44ef11a36e (diff)
downloadkolla-265f643295efa50b8d5c7dc716353883d645c588.tar.gz
kolla-265f643295efa50b8d5c7dc716353883d645c588.zip
Add cyborg to kolla
Because kolla not have cyborg so should add this. Implements: blueprint add-cyborg Change-Id: I497e67e3a754fccfd2ef5a82f13ccfaf890a6fcd
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py8
-rwxr-xr-xkolla/image/build.py6
2 files changed, 14 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 4f2f250d6..4946e80ba 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -338,6 +338,10 @@ SOURCES = {
'type': 'git',
'reference': 'master',
'location': ('https://github.com/pulp/crane.git')},
+ 'cyborg-base': {
+ 'type': 'url',
+ 'location': ('$tarballs_base/cyborg/'
+ 'cyborg-master.tar.gz')},
'designate-base': {
'type': 'url',
'location': ('$tarballs_base/designate/'
@@ -1177,6 +1181,10 @@ USERS = {
'placement-user': {
'uid': 42482,
'gid': 42482,
+ },
+ 'cyborg-user': {
+ 'uid': 42483,
+ 'gid': 42483,
}
}
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 6fbe58408..7683d7904 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -82,6 +82,7 @@ SKIPPED_IMAGES = {
"almanach-base",
"bifrost-base",
"blazar-base",
+ "cyborg-base",
"dragonflow-base",
"freezer-base",
"karbor-base",
@@ -109,6 +110,7 @@ SKIPPED_IMAGES = {
"cloudkitty-base",
"congress-base",
"crane",
+ "cyborg-base",
"dragonflow-base",
"ec2-api",
"freezer-base",
@@ -136,6 +138,7 @@ SKIPPED_IMAGES = {
],
'ubuntu+source': [
"crane",
+ "cyborg-base",
# There is no qdrouterd package for ubuntu bionic
"qdrouterd",
"tripleoclient",
@@ -150,6 +153,7 @@ SKIPPED_IMAGES = {
"cloudkitty-base",
"congress-base",
"crane",
+ "cyborg-base",
"dragonflow-base",
"ec2-api",
"freezer-base",
@@ -176,6 +180,7 @@ SKIPPED_IMAGES = {
],
'debian+source': [
"crane",
+ "cyborg-base",
"sensu-base",
"tripleoclient",
"tripleo-ui"
@@ -185,6 +190,7 @@ SKIPPED_IMAGES = {
"bifrost-base",
"blazar-base",
"crane",
+ "cyborg-base",
"dragonflow-base",
"freezer-base",
"karbor-base",