Merge "switch to vxlan by default"

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

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index ffa716a..bb49bb9 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -10,11 +10,17 @@ nova::compute::vnc_enabled: true
 nova::compute::libvirt::vncserver_listen: '0.0.0.0'
 nova::compute::libvirt::migration_support: true
 
-nova::network::neutron::neutron_admin_tenant_name: 'service'
-nova::network::neutron::neutron_admin_username: 'neutron'
-nova::network::neutron::vif_plugging_is_fatal: false
-nova::network::neutron::vif_plugging_timeout: 30
+nova::compute::rbd::libvirt_rbd_user: 'openstack'
+nova::compute::rbd::rbd_keyring: 'client.openstack'
+nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
+nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
-neutron::plugins::ml2::tunnel_id_ranges: ['1:1000']
+nova::config::nova_config:
+  cinder/catalog_info:
+    value: 'volumev2:cinderv2:internalURL'
+  DEFAULT/default_floating_pool:
+    value: 'public'
 
 ceilometer::agent::auth::auth_tenant_name: 'service'
+
+compute_classes: []
\ No newline at end of file