summaryrefslogtreecommitdiffstats
path: root/docker/services/nova-compute.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-26 19:58:54 +0000
committerGerrit Code Review <review@openstack.org>2017-07-26 19:58:54 +0000
commitf1395f77066eef5d9114a2b13756746f9b1adb2c (patch)
tree25fd6e363c89debfb033ac311dfdc4a95d0171bd /docker/services/nova-compute.yaml
parent4a441359fba69b754cbae1fb13c82fb7472f29b6 (diff)
parented0b77ff93a1a1e071d32f6a758e04c6d0b041ef (diff)
Merge "Provides Ceph config into OpenStack clients"
Diffstat (limited to 'docker/services/nova-compute.yaml')
-rw-r--r--docker/services/nova-compute.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 0426eaec..6b8ebace 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -84,6 +84,10 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
+ - source: "/var/lib/kolla/config_files/src-ceph/"
+ dest: "/etc/ceph/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/nova
owner: nova:nova
@@ -107,6 +111,7 @@ outputs:
- /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
- /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+ - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
- /dev:/dev
- /lib/modules:/lib/modules:ro
- /run:/run
@@ -124,6 +129,10 @@ outputs:
- /var/log/containers/nova
- /var/lib/nova
- /var/lib/libvirt
+ - name: ensure ceph configurations exist
+ file:
+ path: /etc/ceph
+ state: directory
upgrade_tasks:
- name: Stop and disable nova-compute service
tags: step2