diff options
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/ceph.yaml | 4 | ||||
| -rw-r--r-- | puppet/hieradata/common.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/compute.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 5 | ||||
| -rw-r--r-- | puppet/hieradata/volume.yaml | 6 |
5 files changed, 21 insertions, 1 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml index 6eb0e671..18a48622 100644 --- a/puppet/hieradata/ceph.yaml +++ b/puppet/hieradata/ceph.yaml @@ -12,4 +12,6 @@ ceph_pools: - vms - images -ceph_classes: []
\ No newline at end of file +ceph_classes: [] + +ceph_osd_selinux_permissive: true diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 9d152570..ab88a69a 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -13,6 +13,7 @@ nova::network::neutron::vif_plugging_is_fatal: false nova::network::neutron::vif_plugging_timeout: 30 nova::network::neutron::dhcp_domain: '' +neutron::allow_overlapping_ips: true neutron::plugins::ml2::type_drivers: - flat - gre diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 63a3473d..bb49bb90 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -15,6 +15,12 @@ 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' + DEFAULT/default_floating_pool: + value: 'public' + 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 3cc64971..25719709 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -73,12 +73,17 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf nova::notify_on_state_change: 'vm_and_task_state' nova::api::osapi_v3: true +nova::config::nova_config: + DEFAULT/default_floating_pool: + value: 'public' + # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler # heat heat::engine::configure_delegated_roles: false heat::engine::trusts_delegated_roles: [] +heat::instance_user: '' # pacemaker pacemaker::corosync::cluster_name: 'tripleo_cluster' 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 |