commit 3bbdd8744a6d04b890617278cd797e206d2575c0
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Sep 10 21:15:21 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Mon Sep 10 21:15:21 2018 +0000
tree 4853574838f0a741fcaeeb534e661e11ddf57270
parent 680e08bf00df904cecb2d31af4128923e813e335
parent 94de929f9e3548adb7f40071027e8ea1e0e35dbf

Merge "Remove host option"

README.rst

diff --git a/README.rst b/README.rst
index 30ab879..2d599ab 100644
--- a/README.rst
+++ b/README.rst
@@ -440,6 +440,7 @@
             ceph_backend:
               type_name: standard-iops
               backend: ceph_backend
+              backend_host: ceph
               pool: volumes
               engine: ceph
               user: cinder

cinder/files/backend/_ceph.conf

diff --git a/cinder/files/backend/_ceph.conf b/cinder/files/backend/_ceph.conf
index 41f8fa1..75c7dd6 100644
--- a/cinder/files/backend/_ceph.conf
+++ b/cinder/files/backend/_ceph.conf
@@ -1,10 +1,6 @@
 
 [{{ backend_name }}]
-{%- if backend.get('backend_host', False) %}
-backend_host={{ backend.backend_host }}
-{%- else %}
-host={{ backend.get('host', grains.host) }}
-{%- endif %}
+backend_host={{ backend.get('backend_host', backend.get('host', grains.host)) }}
 volume_backend_name={{ backend_name }}
 volume_driver = cinder.volume.drivers.rbd.RBDDriver
 #

tests/pillar/ceph_single.sls

diff --git a/tests/pillar/ceph_single.sls b/tests/pillar/ceph_single.sls
index 761943b..c12365b 100644
--- a/tests/pillar/ceph_single.sls
+++ b/tests/pillar/ceph_single.sls
@@ -4,6 +4,7 @@
     version: liberty
     backend:
       ceph_backend:
+        backend_host: ceph
         type_name: standard-iops
         backend: ceph_backend
         pool: volumes
@@ -58,6 +59,7 @@
     version: liberty
     backend:
       ceph_backend:
+        backend_host: ceph
         type_name: standard-iops
         backend: ceph_backend
         pool: volumes