openstack
/
fuel-web
Code Issues Proposed changes

Change description in the security group section 

Description was changed according to the appropriate spec

Change-Id: I17b4d2d5ff13d3e84b2ebac9ec11645058c62d1e
Partial-Bug: #1646087
This commit is contained in:
Anastasiya 2016-12-01 11:14:02 +03:00 committed by Anastasia Balobashina
parent efdd063170
commit fb167df84c
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py
View File

@ -146,14 +146,17 @@ SECURITY_GROUPS = {
{
'data': 'openvswitch',
'label': 'Open vSwitch Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use OVS Bridges for networking needs.'
'description': 'Choose this driver for OVS based security groups '
'implementation. NOTE: Open vSwitch Firewall '
'Driver requires kernel version >= 4.3 '
'for non-dpdk case.'
},
{
'data': 'iptables_hybrid',
'label': 'Iptables-based Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use Linux Bridges for networking needs.'
'label': 'Iptables-based Firewall Driver'
' (No firewall for DPDK case)',
'description': 'Choose this driver for iptables/linux bridge '
'based security groups implementation.'
}
],
'group': 'security',

6
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -1143,10 +1143,10 @@
values:
- data: "openvswitch"
label: "Open vSwitch Firewall Driver"
description: "Choose this type of firewall driver if you use OVS Bridges for networking needs."
description: "Choose this driver for OVS based security groups implementation. NOTE: Open vSwitch Firewall Driver requires kernel version >= 4.3 for non-dpdk case."
- data: "iptables_hybrid"
label: "Iptables-based Firewall Driver"
description: "Choose this type of firewall driver if you use Linux Bridges for networking needs."
label: "Iptables-based Firewall Driver (No firewall for DPDK case)"
description: "Choose this driver for iptables/linux bridge based security groups implementation."
label: "Security Groups"
group: "security"
weight: 20

13
nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py
View File

@ -39,14 +39,17 @@ SECURITY_GROUPS = {
{
'data': 'openvswitch',
'label': 'Open vSwitch Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use OVS Brige for networking needs.'
'description': 'Choose this driver for OVS based security groups '
'implementation. NOTE: Open vSwitch Firewall '
'Driver requires kernel version >= 4.3 '
'for non-dpdk case.'
},
{
'data': 'iptables_hybrid',
'label': 'Iptables-based Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use Linux Bridge for networking needs.'
'label': 'Iptables-based Firewall Driver'
' (No firewall for DPDK case)',
'description': 'Choose this driver for iptables/linux bridge '
'based security groups implementation.'
}
],
'group': 'security',

13
nailgun/nailgun/test/unit/test_migration_fuel_9_2.py
View File

@ -63,14 +63,17 @@ SECURITY_GROUPS = {
{
'data': 'openvswitch',
'label': 'Open vSwitch Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use OVS Bridges for networking needs.'
'description': 'Choose this driver for OVS based security groups '
'implementation. NOTE: Open vSwitch Firewall '
'Driver requires kernel version >= 4.3 '
'for non-dpdk case.'
},
{
'data': 'iptables_hybrid',
'label': 'Iptables-based Firewall Driver',
'description': 'Choose this type of firewall driver if you'
' use Linux Bridges for networking needs.'
'label': 'Iptables-based Firewall Driver'
' (No firewall for DPDK case)',
'description': 'Choose this driver for iptables/linux bridge '
'based security groups implementation.'
}
],
'group': 'security',