Drive DB initialization via Hiera

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index caca89a..d36cf0b 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -13,16 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if !str2bool(hiera('enable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('enable_package_install option not supported.')
-    }
-  }
-}
+include tripleo::packages
 
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
@@ -44,6 +35,7 @@ exec { 'libvirt-default-net-destroy':
 }
 
 include ::nova
+include ::nova::config
 include ::nova::compute
 
 nova_config {
@@ -51,7 +43,7 @@ nova_config {
   'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
 }
 
-$nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false)
+$nova_enable_rbd_backend = hiera('nova::compute::rbd::ephemeral_storage', false)
 if $nova_enable_rbd_backend {
   include ::ceph::profile::client
 
@@ -68,7 +60,6 @@ include ::neutron
 class { 'neutron::plugins::ml2':
   flat_networks        => split(hiera('neutron_flat_networks'), ','),
   tenant_network_types => [hiera('neutron_tenant_network_type')],
-  type_drivers         => [hiera('neutron_tenant_network_type')],
 }
 
 class { 'neutron::agents::ml2::ovs':
@@ -89,3 +80,5 @@ class { 'snmp':
   agentaddress => ['udp:161','udp6:[::1]:161'],
   snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
 }
+
+hiera_include('compute_classes')