All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 0b40ae0b authored by David Johnson's avatar David Johnson

Fix manila-api port_security neutron api client breakage on queens.

parent 24aea158
--- /usr/lib/python2.7/dist-packages/manila/network/neutron/api.py.orig 2018-02-28 04:27:48.000000000 -0700
+++ /usr/lib/python2.7/dist-packages/manila/network/neutron/api.py 2018-06-21 10:56:50.807123424 -0600
@@ -172,14 +172,14 @@
def create_port(self, tenant_id, network_id, host_id=None, subnet_id=None,
fixed_ip=None, device_owner=None, device_id=None,
- mac_address=None, port_security_enabled=True,
+ mac_address=None, port_security_enabled=False,
security_group_ids=None, dhcp_opts=None, **kwargs):
try:
port_req_body = {'port': {}}
port_req_body['port']['network_id'] = network_id
port_req_body['port']['admin_state_up'] = True
port_req_body['port']['tenant_id'] = tenant_id
- if not port_security_enabled:
+ if port_security_enabled:
port_req_body['port']['port_security_enabled'] = (
port_security_enabled)
elif security_group_ids:
......@@ -2207,6 +2207,13 @@ if [ $OSVERSION -ge $OSMITAKA -a -z "${MANILA_DBPASS}" ]; then
__openstack flavor create manila-service-flavor \
--id 100 --ram 256 --disk 0 --vcpus 1
# Fix a bug in manila-api. This isn't exactly the right fix, I'm
# sure, but because we default neutron port_security off, it works
# fine for us.
if [ $OSVERSION -eq $OSQUEENS ]; then
patch -p0 -d / < $DIRNAME/etc/manila-queens-port-security-bug.patch
fi
service_restart manila-scheduler
service_enable manila-scheduler
service_restart manila-api
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment