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>
'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})
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.