summaryrefslogtreecommitdiffstats
path: root/apex/builders
diff options
context:
space:
mode:
Diffstat (limited to 'apex/builders')
-rw-r--r--apex/builders/common_builder.py12
-rw-r--r--apex/builders/overcloud_builder.py2
-rw-r--r--apex/builders/undercloud_builder.py9
3 files changed, 11 insertions, 12 deletions
diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py
index 05a81ef..0cd683c 100644
--- a/apex/builders/common_builder.py
+++ b/apex/builders/common_builder.py
@@ -25,7 +25,7 @@ from apex.virtual import utils as virt_utils
def project_to_path(project):
"""
- Translates project to absolute file path
+ Translates project to absolute file path to use in patching
:param project: name of project
:return: File path
"""
@@ -36,8 +36,12 @@ def project_to_path(project):
elif 'tripleo-heat-templates' in project:
return "/usr/share/openstack-tripleo-heat-templates"
else:
- # assume python
- return "/usr/lib/python2.7/site-packages/{}".format(project)
+ # assume python. python patches will apply to a project name subdir.
+ # For example, python-tripleoclient patch will apply to the
+ # tripleoclient directory, which is the directory extracted during
+ # python install into the PYTHONPATH. Therefore we need to just be
+ # in the PYTHONPATH directory to apply a patch
+ return "/usr/lib/python2.7/site-packages/"
def project_to_docker_image(project):
@@ -120,7 +124,7 @@ def add_upstream_patches(patches, image, tmp_dir,
"ADD {} {}".format(patch_file, project_path),
"RUN patch -p1 < {}".format(patch_file)
]
- src_img_uri = "{}:8787/{}/centos-binary-{}:" \
+ src_img_uri = "{}:8787/tripleo{}/centos-binary-{}:" \
"{}".format(uc_ip, os_version, service,
docker_tag)
oc_builder.build_dockerfile(service, tmp_dir, docker_cmds,
diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py
index a84d100..d2a3100 100644
--- a/apex/builders/overcloud_builder.py
+++ b/apex/builders/overcloud_builder.py
@@ -53,7 +53,7 @@ def inject_opendaylight(odl_version, image, tmp_dir, uc_ip,
"enabled=1' > /etc/yum.repos.d/opendaylight.repo",
"RUN yum -y install opendaylight"
]
- src_img_uri = "{}:8787/{}/centos-binary-{}:" \
+ src_img_uri = "{}:8787/tripleo{}/centos-binary-{}:" \
"{}".format(uc_ip, os_version, 'opendaylight',
docker_tag)
build_dockerfile('opendaylight', tmp_dir, docker_cmds, src_img_uri)
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: