diff options
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 7 | ||||
| -rw-r--r-- | puppet/hieradata/compute.yaml | 4 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/volume.yaml | 6 |
4 files changed, 13 insertions, 5 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 40c44aef..272a6688 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -13,10 +13,7 @@ nova::network::neutron::vif_plugging_is_fatal: false nova::network::neutron::vif_plugging_timeout: 30 nova::network::neutron::dhcp_domain: '' -neutron::plugins::ml2::tunnel_id_ranges: - - '1:1000' -neutron::plugins::ml2::vni_ranges: - - '1:1000' +neutron::allow_overlapping_ips: true neutron::plugins::ml2::type_drivers: - flat - gre @@ -29,4 +26,4 @@ sysctl_settings: net.ipv4.tcp_keepalive_probes: value: 5 net.ipv4.tcp_keepalive_time: - value: 5
\ No newline at end of file + value: 5 diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 63a3473d..673c7773 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -15,6 +15,10 @@ 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')}" +nova::config::nova_config: + cinder/catalog_info: + value: 'volumev2:cinderv2:internalURL' + ceilometer::agent::auth::auth_tenant_name: 'service' compute_classes: []
\ No newline at end of file diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 72c10c26..3cc64971 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -22,6 +22,7 @@ rabbitmq_config_variables: cluster_partition_handling: 'pause_minority' mongodb::server::replset: tripleo +mongodb::server::journal: false redis::port: 6379 redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}" diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml index 9f3907ef..f4cd78a9 100644 --- a/puppet/hieradata/volume.yaml +++ b/puppet/hieradata/volume.yaml @@ -3,4 +3,10 @@ # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler +cinder::config::cinder_config: + DEFAULT/nova_catalog_info: + value: 'compute:Compute Service:internalURL' + DEFAULT/swift_catalog_info: + value: 'object-store:swift:internalURL' + volume_classes: []
\ No newline at end of file |