summaryrefslogtreecommitdiffstats
path: root/apex/builders/undercloud_builder.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-05-02 12:34:38 -0400
committerTim Rozet <trozet@redhat.com>2018-05-21 10:36:05 -0400
commitd2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch)
tree5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /apex/builders/undercloud_builder.py
parent22bc385f5b2e25694699a614268aaad2fdacbb12 (diff)
Migrates master to use direct upstream
We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/builders/undercloud_builder.py')
-rw-r--r--apex/builders/undercloud_builder.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py
index 268bad7..f82e79d 100644
--- a/apex/builders/undercloud_builder.py
+++ b/apex/builders/undercloud_builder.py
@@ -20,11 +20,6 @@ def add_upstream_packages(image):
:return: None
"""
virt_ops = list()
- # FIXME(trozet): we have to lock to this beta ceph ansible package because
- # the current RPM versioning is wrong and an older package has a higher
- # version than this package. We should change to just 'ceph-ansible'
- # once the package/repo has been fixed. Note: luminous is fine here
- # because Apex will only support container deployment for Queens and later
pkgs = [
'openstack-utils',
'ceph-common',
@@ -34,8 +29,8 @@ def add_upstream_packages(image):
'docker-distribution',
'openstack-tripleo-validations',
'libguestfs-tools',
- 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-luminous' +
- '/ceph-ansible-3.1.0-0.beta3.1.el7.noarch.rpm'
+ 'ceph-ansible',
+ 'python-tripleoclient'
]
for pkg in pkgs: