aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-02 20:18:37 +0000
committerGerrit Code Review <review@openstack.org>2014-09-02 20:18:37 +0000
commitb2e3a746d4b40b9db5462d1b001ffa25c895acb9 (patch)
tree1db951cb4e357a12031259504b154209c617ac10
parent2d6e729c594a3ba17f13c6a7d056e12759530576 (diff)
parentcfb9931ce409ce5c7866dffa63be69758b85bdb9 (diff)
Merge "Change | to > in templates."
-rw-r--r--overcloud-source.yaml12
-rw-r--r--undercloud-source.yaml4
2 files changed, 8 insertions, 8 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 75b87f29..e2423047 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -106,7 +106,7 @@ parameters:
description: Name of an existing EC2 KeyPair to enable SSH access to the instances
type: string
NeutronBridgeMappings:
- description: |
+ description: >
The OVS logical->physical bridge mappings to use. See the Neutron
documentation for details. Defaults to mapping br-ex - the external
bridge on hosts - to a physical name 'datacentre' which can be used
@@ -117,7 +117,7 @@ parameters:
default: "datacentre:br-ex"
NeutronNetworkVLANRanges:
default: 'datacentre'
- description: |
+ description: >
The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the
Neutron documentation for permitted values. Defaults to permitting any
VLAN on the 'datacentre' physical network (See NeutronBridgeMappings).
@@ -173,12 +173,12 @@ parameters:
NeutronFlatNetworks:
type: string
default: 'datacentre'
- description: |
+ description: >
If set, flat networks to configure in neutron plugins. Defaults to
'datacentre' to permit external network creation.
HypervisorNeutronPhysicalBridge:
default: 'br-ex'
- description: |
+ description: >
An OVS bridge to create on each hypervisor. This defaults to br-ex the
same as the control plane nodes, as we have a uniform configuration of
the openvswitch agent. Typically should not need to be changed.
@@ -201,7 +201,7 @@ parameters:
type: string
NeutronPublicInterfaceTag:
default: ''
- description: |
+ description: >
VLAN tag for creating a public VLAN. The tag will be used to
create an access port on the exterior bridge for each control plane node,
and that port will be given the IP address returned by neutron from the
@@ -283,7 +283,7 @@ parameters:
type: json
PublicVirtualFixedIPs:
default: []
- description: |
+ description: >
Control the IP allocation for the PublicVirtualInterface port. E.g.
[{'ip_address':'1.2.3.4'}]
type: json
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 8c0ec83e..369bd3fd 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -134,7 +134,7 @@ parameters:
type: string
NeutronPublicInterfaceIP:
default: ''
- description: |
+ description: >
A custom IP address to put onto the NeutronPublicInterface bridge.
See also NeutronPublicInterfaceTagIP for adding a VLAN tagging IP.
NeutronPublicInterfaceIP is deprecated in the context of deploying
@@ -142,7 +142,7 @@ parameters:
type: string
NeutronPublicInterfaceTag:
default: ''
- description: |
+ description: >
VLAN tag for creating a public VLAN. The tag will be used to
create an access port on the exterior bridge, and that port will be
given the IP address returned by neutron from the public network.