openstack
/
fuel-web
Code Issues Proposed changes

Merge "Change networking selection according to vCenter hypervisor"

This commit is contained in:
Jenkins 2015-07-10 14:02:43 +00:00 committed by Gerrit Code Review
parent 8fb6e5cbcf a748a9b521
commit 55f9e62c00
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1184,6 +1184,8 @@
- data: "nova-network"
label: "dialog.create_cluster_wizard.network.nova_network"
description: "dialog.create_cluster_wizard.network.nova_network_description"
restrictions:
- "Compute.vcenter == false": "dialog.create_cluster_wizard.network.nove_network_vcenter_alert"
bind:
- "cluster:net_provider": "nova_network"
Storage:

5
nailgun/static/translations/core.json
View File

@ -634,9 +634,10 @@
"description": "Choose the private (guest) network configuration. The choice you make here cannot be changed after you finish the wizard. More information see the ",
"description_link": "Mirantis OpenStack Planning Guide for Network Topology",
"release_alert": "Neutron is not supported in __NameAndRelease.release_name__",
"hypervisor_alert": "Neutron with VLAN or GRE segmentaion is not available with __Compute.vcenter__ as a compute option.",
"hypervisor_alert": "Neutron with VLAN or GRE segmentation is not available with __Compute.vcenter__ as a selected compute option.",
"nove_network_vcenter_alert": "Legacy Networking (nova-network) requires __Compute.vcenter__ to be a selected compute option.",
"nova_network": "(DEPRECATED) Legacy Networking (nova-network)",
"nova_network_description": "Choose this option if you use VMware vCenter or require different subnets for public and floating IP addresses. Note that OpenStack is moving to deprecate nova-network in upcoming releases.",
"nova_network_description": "This option is only available if you use VMware vCenter. Note that OpenStack is moving to deprecate nova-network in upcoming releases.",
"neutr_gre": "Neutron with GRE segmentation",
"neutr_gre_description": "The networking equipment must support GRE segmentation. This option supports up to 65535 networks.",
"neutr_vlan": "Neutron with VLAN segmentation (default)",