openstack/kolla-ansible
Code Issues Proposed changes

Use "optional" for ceph confs

Browse Source 
Also add missing cinder-backup ceph.conf info

TrivialFix

Change-Id: I2b2d85c2d34908a9b11198eb51b3cf359a06bdf7
This commit is contained in:
SamYaple 2016-02-16 16:41:44 +00:00
parent a71c9cbacd
commit 81f5b2ac79
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/cinder/templates/cinder-backup.json.j2
View File

@ -6,6 +6,20 @@
"dest": "/etc/cinder/cinder.conf", "dest": "/etc/cinder/cinder.conf",
"owner": "cinder", "owner": "cinder",
"perm": "0600" "perm": "0600"
},
{
"source": "{{ container_config_directory }}/ceph.client.cinder-backup.keyring",
"dest": "/etc/ceph/ceph.client.cinder-backup.keyring",
"owner": "cinder",
"perm": "0600",
"optional": "true"
},
{
"source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf",
"owner": "cinder",
"perm": "0600",
"optional": "true"
} }
] ]
} }

10
ansible/roles/cinder/templates/cinder-volume.json.j2
View File

@ -6,18 +6,20 @@
"dest": "/etc/cinder/cinder.conf", "dest": "/etc/cinder/cinder.conf",
"owner": "cinder", "owner": "cinder",
"perm": "0600" "perm": "0600"
}{% if enable_ceph | bool %}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.cinder.keyring", "source": "{{ container_config_directory }}/ceph.client.cinder.keyring",
"dest": "/etc/ceph/ceph.client.cinder.keyring", "dest": "/etc/ceph/ceph.client.cinder.keyring",
"owner": "cinder", "owner": "cinder",
"perm": "0600" "perm": "0600",
"optional": "true"
}, },
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf", "dest": "/etc/ceph/ceph.conf",
"owner": "cinder", "owner": "cinder",
"perm": "0600" "perm": "0600",
}{% endif %} "optional": "true"
}
] ]
} }