openstack
/
fuel-web
Code Issues Proposed changes

Merge "Mark nova-network and classic provisioning as deprecated"

This commit is contained in:
Jenkins 2015-04-30 09:07:36 +00:00 committed by Gerrit Code Review
parent e79e6802a6 69e8becc6e
commit bda8f15de4
2 changed files with 2 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

@ -722,7 +722,7 @@
label: "Image"
description: "Copying pre-built images on a disk."
- data: "cobbler"
label: "Classic (use anaconda or debian-installer)"
label: "(DEPRECATED) Classic (use anaconda or debian-installer)"
description: "Install from scratch using anaconda or debian-installer."
external_dns:
metadata:

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

@ -609,7 +609,7 @@
"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.",
"nova_network": "Legacy Networking (nova-network)",
"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.",
"neutr_gre": "Neutron with GRE segmentation",
"neutr_gre_description": "The networking equipment must support GRE segmentation. This option supports up to 65535 networks.",