diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-01-08 08:23:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-01-08 08:23:50 +0000 |
| commit | e6a98a74e531da1334dea302a76589950718f855 (patch) | |
| tree | 43064b5320d94d92eb5a3beac12df474aabb225d /overcloud-without-mergepy.yaml | |
| parent | 7cdb8ca6b46ee3ef04bc578db587a5329ce67624 (diff) | |
| parent | e137dd54d371f5830162ba19cb6fdf018f12e6e7 (diff) | |
Merge "Allow setting Neutron tunnel type in no mergepy"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 7578cc2a..f704abaa 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -509,6 +509,8 @@ resources: NeutronAgentMode: {get_param: NeutronAgentMode} NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} + NeutronNetworkType: {get_param: NeutronNetworkType} + NeutronTunnelTypes: {get_param: NeutronTunnelTypes} NovaPassword: {get_param: NovaPassword} NtpServer: {get_param: NtpServer} PublicVirtualInterface: {get_param: PublicVirtualInterface} |