aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-11 03:46:45 +0000
committerGerrit Code Review <review@openstack.org>2014-07-11 03:46:45 +0000
commit2c982451e6e0ff6a9537cc56324ba6d0d4986712 (patch)
tree6e913ad9ac1ea40b947b5eed5dd100b488936096
parenta7f2a2c928e9c78a18defb68feb40da8c7eb95d6 (diff)
parentfec794736f3b844b479f23cc560c9b29af196ae2 (diff)
Merge "Use the right DSN for neutron agents."
-rw-r--r--overcloud-source.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 6bf9a595..7cce21a3 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -294,7 +294,7 @@ Resources:
GlanceHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/nova']]}
CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/ceilometer']]}
- NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/neutron']]}
+ NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/ovs_neutron']]}
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
NeutronFlatNetworks: