Merge "Fix network-isolation.yaml to stop clobbering Management net"

[apex-tripleo-heat-templates.git] / puppet / hieradata / database.yaml

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 7af1ac2..9b2ea4f 100644 (file)
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -13,22 +13,6 @@ nova::db::mysql_api::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
 
-# Neutron
-neutron::db::mysql::user: neutron
-neutron::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-neutron::db::mysql::dbname: ovs_neutron
-neutron::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
-# Ironic
-ironic::db::mysql::user: ironic
-ironic::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-ironic::db::mysql::dbname: ironic
-ironic::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
 # Ceilometer
 ceilometer::db::mysql::user: ceilometer
 ceilometer::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
@@ -52,11 +36,3 @@ aodh::db::mysql::dbname: aodh
 aodh::db::mysql::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
-
-
-sahara::db::mysql::user: sahara
-sahara::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-sahara::db::mysql::dbname: sahara
-sahara::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"