Skip to content
Snippets Groups Projects
Commit 0109f99f authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Use "optional" for ceph confs"

parents 0cb1d969 81f5b2ac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/cinder/templates/cinder-backup.json.j2
+ 14
− 0
View file @ 0109f99f
...@@ -6,6 +6,20 @@ ...@@ -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"
} }
] ]
} }
ansible/roles/cinder/templates/cinder-volume.json.j2
+ 6
− 4
View file @ 0109f99f
...@@ -6,18 +6,20 @@ ...@@ -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"
}
] ]
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment