aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-04 13:52:36 +0000
committerGerrit Code Review <review@openstack.org>2017-07-04 13:52:36 +0000
commit86a15be86fd5f855d88a67c5090f032a362eebca (patch)
treeb75c7a2aeb8e998fc9bf46d3c05335f7862e460f /kolla
parent1a546eda46580ab75ca479eb40b8072b81f7b4ac (diff)
parent1ae703e4a4886efded1535d2278c10b4b4ae0630 (diff)
downloadkolla-86a15be86fd5f855d88a67c5090f032a362eebca.tar.gz
kolla-86a15be86fd5f855d88a67c5090f032a362eebca.zip
Merge "Add images for novajoin services"
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index f71793490..5fe373a15 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -87,7 +87,7 @@ _PROFILE_OPTS = [
'iscsi',
'keystone',
'neutron',
- 'nova',
+ 'nova-',
'swift',
],
help='Main images'),
@@ -111,6 +111,7 @@ _PROFILE_OPTS = [
'mistral',
'monasca',
'murano',
+ 'novajoin',
'octavia',
'panko',
'rally',
@@ -143,7 +144,7 @@ _PROFILE_OPTS = [
'mariadb',
'memcached',
'neutron',
- 'nova',
+ 'nova-',
'openvswitch',
'rabbitmq',
],
@@ -162,7 +163,7 @@ _PROFILE_OPTS = [
'mariadb',
'memcached',
'neutron',
- 'nova',
+ 'nova-',
'openvswitch',
'rabbitmq',
],
@@ -553,6 +554,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/blazar-nova/'
'blazar-nova-master.tar.gz')},
+ 'novajoin-base': {
+ 'type': 'url',
+ 'location': ('$tarballs_base/novajoin/'
+ 'novajoin-master.tar.gz')},
'octavia-base': {
'type': 'url',
'location': ('$tarballs_base/octavia/'
@@ -896,6 +901,10 @@ USERS = {
'kuryr-user': {
'uid': 42469,
'gid': 42469,
+ },
+ 'novajoin-user': {
+ 'uid': 42470,
+ 'gid': 42470,
}
}