Fixed path to debian/cinder.conf in debian/rules

Rewritten-From: a09b924a5e6bb2c982ac996688d567e199f1283a

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 45b7f4e89a21ee13cf18d298185c17f54e0ba2d0..5dd0bda07a4e7c6517bed3e7973a47683e0436d3 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -22,7 +22,7 @@ override_dh_install:
        dh_install --fail-missing -Xbin/cinder-all
        install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
 
-       install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       install -D -m 0644 $(CURDIR)/debian/cinder.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
        #install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Disable https in default setup, as this makes our CI fail