Allow use of port 22 for LBaaS VIP

LBaaS allows use of port 22 as a VIP listener. Yet, this port on the
Edge appliance was occupied by the Edge SSH daemon. As SSH access to
the Edge is not required, we can disable it and allow use of this port
for LBaaS listeners.

Change-Id: I7f0781359b94282d31d6a4b7d0afa76ef8095a95
Closes-Bug: #1552115
This commit is contained in:
Kobi Samoray 2016-03-02 15:18:12 +02:00
parent 42342b3cfa
commit e6549afbe4

View File

@ -486,7 +486,7 @@ class EdgeApplianceDriver(object):
edge = self._assemble_edge(
edge_name, datacenter_moid=self.datacenter_moid,
deployment_container_id=self.deployment_container_id,
appliance_size=appliance_size, remote_access=True, dist=dist)
appliance_size=appliance_size, remote_access=False, dist=dist)
appliance = self._assemble_edge_appliance(self.resource_pool_id,
self.datastore_id)
if appliance:
@ -509,12 +509,13 @@ class EdgeApplianceDriver(object):
constants.INTEGRATION_SUBNET_NETMASK,
type="internal")
edge['vnics']['vnics'].append(vnic_inside)
# If default login credentials for Edge are set, configure accordingly
if (cfg.CONF.nsxv.edge_appliance_user and
cfg.CONF.nsxv.edge_appliance_password):
edge['cliSettings'] = {
edge['cliSettings'].update({
'userName': cfg.CONF.nsxv.edge_appliance_user,
'password': cfg.CONF.nsxv.edge_appliance_password}
'password': cfg.CONF.nsxv.edge_appliance_password})
if not dist and loadbalancer_enable:
self._enable_loadbalancer(edge)
@ -573,7 +574,7 @@ class EdgeApplianceDriver(object):
edge = self._assemble_edge(
edge_name, datacenter_moid=self.datacenter_moid,
deployment_container_id=self.deployment_container_id,
appliance_size=appliance_size, remote_access=True, dist=dist)
appliance_size=appliance_size, remote_access=False, dist=dist)
edge['id'] = edge_id
appliance = self._assemble_edge_appliance(self.resource_pool_id,
self.datastore_id)