From: wu.zhihui Date: Mon, 4 Jul 2016 07:20:51 +0000 (+0800) Subject: Modify the indent in fuel-odl_0.9.0.yaml. X-Git-Tag: colorado.1.rc1~85 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9d297e24981101f99e9c72de9ff4c6c0b69a505f;p=fuel.git Modify the indent in fuel-odl_0.9.0.yaml. Change-Id: I15bb84c35c075037df23746b75b108e2d7b90ede Signed-off-by: wu.zhihui --- diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml index e192ad962..90a64949c 100644 --- a/deploy/config/plugins/fuel-odl_0.9.0.yaml +++ b/deploy/config/plugins/fuel-odl_0.9.0.yaml @@ -12,148 +12,148 @@ plugin-config-metadata: version: 0.4 created: 30.06.2016 comment: Add new field for boron version - opendaylight: - metadata: - #chosen_id: Assigned during installation - class: plugin - default: false - enabled: true - label: OpenDaylight plugin - toggleable: true - versions: - - bgpvpn_gateway: - description: Define the default gateway for BGPVPN - label: Default Gateway - regex: - error: Invalid ip number - source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ - restrictions: - - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN - is enabled. - type: text - value: 0.0.0.0 - weight: 50 - enable_bgpvpn: - description: 'This enables the bgpvpn extension of neutron togethere with - the corresponding sdnvpn features in odl. This feature will disable the - standart ovsdb feature from ODL. +opendaylight: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: OpenDaylight plugin + toggleable: true + versions: + - bgpvpn_gateway: + description: Define the default gateway for BGPVPN + label: Default Gateway + regex: + error: Invalid ip number + source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ + restrictions: + - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN + is enabled. + type: text + value: 0.0.0.0 + weight: 50 + enable_bgpvpn: + description: 'This enables the bgpvpn extension of neutron togethere with + the corresponding sdnvpn features in odl. This feature will disable the + standart ovsdb feature from ODL. - ' - label: BGPVPN extensions - restrictions: - - condition: settings:bgpvpn == null or settings:bgpvpn.metadata.enabled - == false - message: BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled. - strict: false - - networking_parameters:segmentation_type == 'vlan': This feature works - only with segmentation_type != vlan - type: checkbox - value: false - weight: 40 - enable_l3_odl: - label: Use ODL to manage L3 traffic - restrictions: - - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation - type. - - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign - public network to all nodes - type: checkbox - value: false - weight: 10 - enable_sfc: - label: SFC features - type: checkbox - value: false - weight: 20 - sfc_class: - description: 'Classifier determines what traffic needs to be chained based - on policy based on yang model. The OpenDayLight actually supports the - OVSDB NetVirt and the GBP classifier in case of SFC. + ' + label: BGPVPN extensions + restrictions: + - condition: settings:bgpvpn == null or settings:bgpvpn.metadata.enabled + == false + message: BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled. + strict: false + - networking_parameters:segmentation_type == 'vlan': This feature works + only with segmentation_type != vlan + type: checkbox + value: false + weight: 40 + enable_l3_odl: + label: Use ODL to manage L3 traffic + restrictions: + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes + type: checkbox + value: false + weight: 10 + enable_sfc: + label: SFC features + type: checkbox + value: false + weight: 20 + sfc_class: + description: 'Classifier determines what traffic needs to be chained based + on policy based on yang model. The OpenDayLight actually supports the + OVSDB NetVirt and the GBP classifier in case of SFC. - ' - label: Classifier used by SFC - restrictions: - - action: hide - condition: settings:opendaylight.enable_sfc.value == false - type: select - value: ncr - values: - - data: ncr - label: NetVirt - - data: gcr - label: GBP - weight: 21 - package_name: - description: 'Plugin can be build with dedicated package for SFC. Before - choosing opendaylight-boron ensure that plugin include this package. + ' + label: Classifier used by SFC + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: ncr + values: + - data: ncr + label: NetVirt + - data: gcr + label: GBP + weight: 21 + package_name: + description: 'Plugin can be build with dedicated package for SFC. Before + choosing opendaylight-boron ensure that plugin include this package. - ' - label: Name of opendaylight deb package - restrictions: - - action: hide - condition: settings:opendaylight.enable_sfc.value == false - type: select - value: opendaylight - values: - - data: opendaylight - label: opendaylight - - data: opendaylight-boron - label: opendaylight-boron - weight: 22 - metadata: - default_credentials: - password: admin - user: admin - hot_pluggable: false - jetty_port: 8181 - odl_features: - default: - - config - - standard - - region - - package - - kar - - ssh - - management - gcr: - - odl-groupbasedpolicy-ovssfc - ncr: - - odl-ovsdb-sfc - - odl-ovsdb-sfc-rest - odl-default: - - odl-restconf-all - - odl-aaa-authn - - odl-dlux-all - ovs: - - odl-ovsdb-openstack - sfc: - - odl-sfc-model - - odl-sfc-provider - - odl-sfc-provider-rest - - odl-sfc-sb-rest - - odl-sfc-ui - - odl-sfc-netconf - - odl-sfc-ovs - - odl-sfcofl2 - vpn: - - odl-vpnservice-openstack - #plugin_id: Assigned during installation - plugin_version: 0.9.0 - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight - odl_v2: - description: V2 version is considered as experimental - label: Use V2 ML2 driver - type: checkbox - value: true - weight: 60 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 70 - weight: 70 + ' + label: Name of opendaylight deb package + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: opendaylight + values: + - data: opendaylight + label: opendaylight + - data: opendaylight-boron + label: opendaylight-boron + weight: 22 + metadata: + default_credentials: + password: admin + user: admin + hot_pluggable: false + jetty_port: 8181 + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + odl-default: + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + ovs: + - odl-ovsdb-openstack + sfc: + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + vpn: + - odl-vpnservice-openstack + #plugin_id: Assigned during installation + plugin_version: 0.9.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + odl_v2: + description: V2 version is considered as experimental + label: Use V2 ML2 driver + type: checkbox + value: true + weight: 60 + rest_api_port: + description: Port on which ODL REST API will be available. + label: Port number + regex: + error: Invalid port number + source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ + type: text + value: '8282' + weight: 70 + weight: 70