summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-12-05 10:54:38 -0500
committerTim Rozet <trozet@redhat.com>2018-12-05 13:56:52 -0500
commitea88285a511f7aa13cff3d491e143d17188b700f (patch)
treebf2ba5cd96db6490b7eaa0eccddd786e537a7921
parent5c41b8486a46e3c86a573b7130792624b3f5ed26 (diff)
Fixes incompatible python-docker package
When adding upstream packages to undercloud image, there is a conflict between a new dependency python2-docker and already installed python-docker. This patch removes the latter before trying to install upstream packages. Also, updates nic templates based on: https://review.openstack.org/#/c/604943/ Change-Id: Ia7db0a3b37652d066bbe80478689f4d1ebaea560 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--apex/builders/undercloud_builder.py2
-rw-r--r--build/nics-template.yaml.jinja28
2 files changed, 10 insertions, 0 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py
index d9e2333..943c252 100644
--- a/apex/builders/undercloud_builder.py
+++ b/apex/builders/undercloud_builder.py
@@ -39,6 +39,8 @@ def add_upstream_packages(image):
'python-tripleoclient',
'openstack-tripleo-heat-templates'
]
+ # Remove incompatible python-docker version
+ virt_ops.append({con.VIRT_RUN_CMD: "yum remove -y python-docker-py"})
for pkg in pkgs:
virt_ops.append({con.VIRT_INSTALL: pkg})
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 189654c..6d1fb9c 100644
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -9,6 +9,14 @@ parameters:
default: ''
description: IP address/subnet on the ctlplane network
type: string
+ ControlPlaneStaticRoutes:
+ default: []
+ description: >
+ Routes for the ctlplane network traffic.
+ JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+ Unless the default is changed, the parameter is automatically resolved
+ from the subnet host_routes attribute.
+ type: json
ExternalNetworkVlanID:
default: 10
description: Vlan ID for the external network traffic.