Use "optional" for ceph confs

Also add missing cinder-backup ceph.conf info

TrivialFix

Change-Id: I2b2d85c2d34908a9b11198eb51b3cf359a06bdf7

ansible/roles/cinder/templates/cinder-backup.json.j2

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