diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-04 10:39:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-04 10:39:19 +0000 |
| commit | 5caa5e30de05f5879fe56c3b0cb56329c8116d87 (patch) | |
| tree | fb48538e55cee16d6211f00b1f9aa2384d63eec7 /kolla | |
| parent | 9ef9cbeb8f3504a4d80716e5e6ae7e9e6bb372d6 (diff) | |
| parent | 14374e715d2a5057a28126c7193cfb6270eabaab (diff) | |
| download | kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.tar.gz kolla-5caa5e30de05f5879fe56c3b0cb56329c8116d87.zip | |
Merge "Bump Ubuntu base image to 18.04"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index d61a80adb..f9116a631 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -26,14 +26,14 @@ DEFAULT_BASE_TAGS = { 'rhel': '7', 'oraclelinux': '7-slim', 'debian': 'stretch-backports', - 'ubuntu': '16.04', + 'ubuntu': '18.04', } DISTRO_RELEASE = { 'centos': '7', 'rhel': '7', 'oraclelinux': '7', 'debian': 'stretch-backports', - 'ubuntu': '16.04', + 'ubuntu': '18.04', } # This is noarch repository so we will use it on all architectures diff --git a/kolla/image/build.py b/kolla/image/build.py index 62877bc66..04eba0095 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -124,6 +124,8 @@ SKIPPED_IMAGES = { "nova-mksproxy", "novajoin-base", "octavia-base", + # There is no qdrouterd package for ubuntu bionic + "qdrouterd", "searchlight-base", "solum-base", "tacker-base", @@ -137,6 +139,8 @@ SKIPPED_IMAGES = { # TODO(spsurya): remove neutron-server-opendaylight fix below issue # https://bugs.launchpad.net/kolla/+bug/1764621 "neutron-server-opendaylight", + # There is no qdrouterd package for ubuntu bionic + "qdrouterd", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed # https://bugs.launchpad.net/tripleo/+bug/1744215 "tripleo-ui" |