diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-31 10:15:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-31 10:15:48 +0000 |
| commit | 8f37ea165b75ff9cb069a7b0fd45e4d30a4c3c26 (patch) | |
| tree | cb5ad0edf8e8f437e5dbf5a4dae4b4fe670ce0ca /docker/services/nova-compute.yaml | |
| parent | 716374680b3d77745adb382a86dfe92801b803b2 (diff) | |
| parent | 9d82796da2ae30be4eb3dfcc9612c6947f882ded (diff) | |
Merge "docker: eliminate copy-json.py in favor of json-file"
Diffstat (limited to 'docker/services/nova-compute.yaml')
| -rw-r--r-- | docker/services/nova-compute.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index c695c94d..e765609e 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -41,6 +41,18 @@ outputs: config_settings: {get_attr: [NovaComputeBase, role_data, config_settings]} step_config: {get_attr: [NovaComputeBase, role_data, step_config]} puppet_tags: nova_config,nova_paste_api_ini + kolla_config: + /var/lib/etc-data/json-config/nova-compute.json: + command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf + config_files: + - dest: /etc/nova/nova.conf + owner: nova + perm: '0600' + source: /var/lib/kolla/config_files/nova.conf + - dest: /etc/nova/rootwrap.conf + owner: nova + perm: '0600' + source: /var/lib/kolla/config_files/rootwrap.conf docker_config: step_1: novacompute: |