diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-01 16:26:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-01 16:26:24 +0000 |
commit | f733b2edd1721fb187d3f261e2d8d8ab3f40c9f1 (patch) | |
tree | 7647b51e84befa9c314b326fc3244d0c3317b404 /puppet/services/nova-compute.yaml | |
parent | 337d2c62038bde10cfb48d6c1bd09f3cbf72ba6a (diff) | |
parent | 9f1b58e8ac3825a9668a1dcb8d24f6aa9c5e3d3a (diff) |
Merge "First iteration of libvirt and nova-compute as a composable services"
Diffstat (limited to 'puppet/services/nova-compute.yaml')
-rw-r--r-- | puppet/services/nova-compute.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 0844aa85..679586f7 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -16,10 +16,18 @@ resources: outputs: role_data: - description: Role data for the Nova Conductor service. + description: Role data for the Nova Compute service. value: config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] + - nova::compute::libvirt::manage_libvirt_services: false + # we manage migration in nova common puppet profile + nova::compute::libvirt::migration_support: false + tripleo::profile::base::nova::manage_migration: true + tripleo::profile::base::nova::nova_compute_enabled: true step_config: | - include tripleo::profile::base::nova::compute + # TODO(emilien): figure how to deal with libvirt profile. + # We'll probably threat it like we do with Neutron plugins. + # Until then, just include it in the default nova-compute role. + include tripleo::profile::base::nova::compute::libvirt |