diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 34 | ||||
| -rw-r--r-- | puppet/services/nova-compute.yaml | 13 |
2 files changed, 13 insertions, 34 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml deleted file mode 100644 index db1fd09d..00000000 --- a/puppet/ceph-cluster-config.yaml +++ /dev/null @@ -1,34 +0,0 @@ -heat_template_version: 2015-04-30 -description: 'Ceph Cluster config data for Puppet' - -parameters: - NovaRbdPoolName: - default: vms - type: string - CephClientUserName: - default: openstack - type: string - -resources: - CephClusterConfigImpl: - type: OS::Heat::StructuredConfig - properties: - group: os-apply-config - config: - hiera: - datafiles: - ceph_cluster: - mapped_data: - nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName} - nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName} - nova::compute::rbd::rbd_keyring: - list_join: - - '.' - - - 'client' - - {get_param: CephClientUserName} - -outputs: - config_id: - description: The ID of the CephClusterConfigImpl resource. - value: - {get_resource: CephClusterConfigImpl} diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 341bd978..a7226bd0 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -9,6 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + NovaRbdPoolName: + default: vms + type: string + CephClientUserName: + default: openstack + type: string resources: NovaBase: @@ -29,6 +35,13 @@ outputs: nova::compute::libvirt::migration_support: false tripleo::profile::base::nova::manage_migration: true tripleo::profile::base::nova::nova_compute_enabled: true + nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName} + nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName} + nova::compute::rbd::rbd_keyring: + list_join: + - '.' + - - 'client' + - {get_param: CephClientUserName} step_config: | # TODO(emilien): figure how to deal with libvirt profile. # We'll probably threat it like we do with Neutron plugins. |