Keep backward compatibility for openstack port create

openstack port create was introduced in Newton. Keep backwards
compatibility in places that are used on Mitaka code during upgrades.

Change-Id: I32da9f291bdfa18038a9f5412a06476b5da29f08
This commit is contained in:
Vasyl Saienko 2016-05-20 15:51:22 +03:00 committed by John L. Villalovos
parent 8cb87b0c99
commit 0d9ee77c16

View File

@ -673,7 +673,11 @@ function create_ovs_taps {
# need to create one in Neutron to know what netns to tap into prior to the # need to create one in Neutron to know what netns to tap into prior to the
# first node booting. # first node booting.
local port_id local port_id
port_id=$(openstack port create --network ${ironic_net_id} temp_port -c id -f value) port_id=$(neutron port-create ${ironic_net_id} | grep " id " | get_field 2)
# NOTE(vsaienko) openstack port create was introduced in Newton.
# Since the function is used during upgrade, it should be backward compatible with Mitaka.
# Switch to openstack port create in Ocata release.
#port_id=$(openstack port create --network ${ironic_net_id} temp_port -c id -f value)
die_if_not_set $LINENO port_id "Failed to create neutron port" die_if_not_set $LINENO port_id "Failed to create neutron port"
# intentional sleep to make sure the tag has been set to port # intentional sleep to make sure the tag has been set to port