diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-26 10:44:30 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-26 10:44:30 +0000 |
commit | 763b275d036e34c900a09cd92ee477e6b156f60b (patch) | |
tree | e927a154acff0c7f8c86985844def71074723f31 /puppet/services | |
parent | 77f6c40352adaad6e59b9f39435406a8176e134f (diff) | |
parent | 2720b5d4c875c9794562776114083d9c5fc55896 (diff) |
Merge "Cleanup templates from the shared CephCluster config"
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/nova-compute.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
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. |