diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-07 06:55:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-07 06:55:22 +0000 |
commit | 0bbf34a21b1eecdfdf1bacc14ea0b93edbbd2435 (patch) | |
tree | 91260459998d823c13f06b4eb7458e0aade3f44d /puppet/hieradata | |
parent | bca9e7fa9f18a436b0840f17454516c8a10f36fd (diff) | |
parent | e8c641372ea2c6a0367f03fb01d758827e9f68d3 (diff) |
Merge "Allow customization of included classes via hieradata"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r-- | puppet/hieradata/ceph.yaml | 2 | ||||
-rw-r--r-- | puppet/hieradata/compute.yaml | 2 | ||||
-rw-r--r-- | puppet/hieradata/controller.yaml | 2 | ||||
-rw-r--r-- | puppet/hieradata/object.yaml | 2 | ||||
-rw-r--r-- | puppet/hieradata/volume.yaml | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml index 280457df..6eb0e671 100644 --- a/puppet/hieradata/ceph.yaml +++ b/puppet/hieradata/ceph.yaml @@ -11,3 +11,5 @@ ceph_pools: - volumes - vms - images + +ceph_classes: []
\ No newline at end of file diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 4915d3c8..63a3473d 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -16,3 +16,5 @@ nova::compute::rbd::libvirt_images_rbd_pool: 'vms' nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}" 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 3de9bd91..eb45ee13 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -111,3 +111,5 @@ tripleo::loadbalancer::heat_api: true tripleo::loadbalancer::heat_cloudwatch: true tripleo::loadbalancer::heat_cfn: true tripleo::loadbalancer::horizon: true + +controller_classes: []
\ No newline at end of file diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml index 59a8b1cf..3a379035 100644 --- a/puppet/hieradata/object.yaml +++ b/puppet/hieradata/object.yaml @@ -14,3 +14,5 @@ swift::proxy::keystone::operator_roles: - admin - swiftoperator - ResellerAdmin + +object_classes: []
\ No newline at end of file diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml index ad9e2c2a..9f3907ef 100644 --- a/puppet/hieradata/volume.yaml +++ b/puppet/hieradata/volume.yaml @@ -2,3 +2,5 @@ # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler + +volume_classes: []
\ No newline at end of file |