diff --git a/cinder-17.0.0.tar.gz b/cinder-18.0.0.tar.gz
similarity index 43%
rename from cinder-17.0.0.tar.gz
rename to cinder-18.0.0.tar.gz
index 9b9bf709f67c34669c2802df0a27535638cfb75d..25cdaa523d7d7a0cf66bdd44a9a21b888029fbc4 100644
Binary files a/cinder-17.0.0.tar.gz and b/cinder-18.0.0.tar.gz differ
diff --git a/cinder-dist.conf b/cinder-dist.conf
deleted file mode 100644
index 16be89ba56dc92f6fe9a9521914ffe9e7d650820..0000000000000000000000000000000000000000
--- a/cinder-dist.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[DEFAULT]
-log_dir = /var/log/cinder
-use_stderr = False
-state_path = /var/lib/cinder
-lock_path = /var/lib/cinder/tmp
-volumes_dir = /etc/cinder/volumes
-iscsi_helper = lioadm
-rootwrap_config = /etc/cinder/rootwrap.conf
-auth_strategy = keystone
-
-[database]
-connection = mysql://cinder:cinder@localhost/cinder
-
-[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
diff --git a/openstack-cinder-api.service b/openstack-cinder-api.service
index a3c890a0b16bc8dde3ace745edbccc768b7833b9..e87c4b8070f015488dbaa6ad6ae0f61fc59fe03e 100644
--- a/openstack-cinder-api.service
+++ b/openstack-cinder-api.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-api --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log
+ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log
 Restart=on-failure
 KillMode=process
 
diff --git a/openstack-cinder-backup.service b/openstack-cinder-backup.service
index 39d38773f9f6eb6e9aed3b9972c132ed6188dd43..61e317b1f083a0e9e4a52768111635f4bddc7b7e 100644
--- a/openstack-cinder-backup.service
+++ b/openstack-cinder-backup.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log
+ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log
 Restart=on-failure
 
 [Install]
diff --git a/openstack-cinder-scheduler.service b/openstack-cinder-scheduler.service
index 806208192a509b58019bf6fe07b76751e292f165..bc9c7bf2914f394feea051fcb5f1cc572271ab8e 100644
--- a/openstack-cinder-scheduler.service
+++ b/openstack-cinder-scheduler.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log
+ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log
 Restart=on-failure
 
 [Install]
diff --git a/openstack-cinder-volume.service b/openstack-cinder-volume.service
index 919bf8d9e5768a82b371407cda4553c2e2c682ab..91a8f78809a954ef4e83c2ad17bc7cd9294e1e4a 100644
--- a/openstack-cinder-volume.service
+++ b/openstack-cinder-volume.service
@@ -7,7 +7,7 @@ LimitNOFILE=131072
 LimitNPROC=131072
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log
+ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log
 Restart=on-failure
 KillMode=process
 
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 89c0db6dc7230d7a9801ef23a03136f1b80c6235..5f7b1aaf5475e80522a2a4207ec43d4705e292a6 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,5 +1,3 @@
-%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
-%global with_doc %{!?_without_doc:0}%{?_without_doc:1}
 %global service cinder
 
 %global common_desc \
@@ -7,401 +5,371 @@ OpenStack Volume (codename Cinder) provides services to manage and \
 access block storage volumes for use by Virtual Machine instances.
 
 Name:             openstack-%{service}
-Version:          17.0.0
-Release:          4
+Version:          18.0.0
+Release:          1
 Summary:          OpenStack Volume service
-
-License:          Apache-2.0
+License:          ASL 2.0
 URL:              http://www.openstack.org/software/openstack-storage/
-Source0:          https://tarballs.openstack.org/%{service}/%{service}-%{upstream_version}.tar.gz
-
+BuildArch:        noarch
 
-Source1:          %{service}-dist.conf
-Source2:          %{service}.logrotate
+Source0:          https://tarballs.openstack.org/cinder/cinder-18.0.0.tar.gz
 
 Source10:         openstack-%{service}-api.service
 Source11:         openstack-%{service}-scheduler.service
 Source12:         openstack-%{service}-volume.service
 Source13:         openstack-%{service}-backup.service
-Source20:         %{service}-sudoers
-
-
-BuildArch:        noarch
 
-BuildRequires:    intltool
-BuildRequires:    python3-pbr
-BuildRequires:    python3-reno
-BuildRequires:    python3-devel
-BuildRequires:    python3-setuptools
-BuildRequires:    python3-netaddr
-BuildRequires:    systemd
-BuildRequires:    python3-os-brick
-BuildRequires:    python3-pyparsing
-BuildRequires:    python3-pytz
-BuildRequires:    openstack-macros
-BuildRequires:    python3-cursive
-BuildRequires:    python3-google-api-client >= 1.4.2
-BuildRequires:    python3-keystonemiddleware
-BuildRequires:    python3-glanceclient >= 2.15.0
-BuildRequires:    python3-novaclient >= 9.1.0
-BuildRequires:    python3-swiftclient >= 3.2.0
-BuildRequires:    python3-oslo-db
-BuildRequires:    python3-oslo-config
-BuildRequires:    python3-oslo-policy
-BuildRequires:    python3-oslo-privsep
-BuildRequires:    python3-oslo-reports
-BuildRequires:    python3-oslotest
-BuildRequires:    python3-oslo-utils
-BuildRequires:    python3-oslo-versionedobjects
-BuildRequires:    python3-oslo-vmware
-BuildRequires:    python3-os-win
-BuildRequires:    python3-castellan
-BuildRequires:    python3-cryptography
-BuildRequires:    python3-osprofiler
-BuildRequires:    python3-paramiko
-BuildRequires:    python3-suds
-BuildRequires:    python3-taskflow
-BuildRequires:    python3-tooz
-BuildRequires:    python3-oslo-log
-BuildRequires:    python3-oslo-i18n
-BuildRequires:    python3-barbicanclient
-BuildRequires:    python3-requests
-BuildRequires:    python3-defusedxml
-BuildRequires:    python3-pip
-
-BuildRequires:    python3-babel
-
-BuildRequires:    python3-ddt
-BuildRequires:    python3-fixtures
-BuildRequires:    python3-mock
-BuildRequires:    python3-oslotest
-BuildRequires:    python3-packaging
-BuildRequires:    python3-subunit
-BuildRequires:    python3-testtools
-BuildRequires:    python3-testrepository
-BuildRequires:    python3-testresources
-BuildRequires:    python3-testscenarios
-BuildRequires:    python3-os-testr
-BuildRequires:    python3-tabulate
-
-BuildRequires:    python3-decorator
-BuildRequires:    python3-lxml
-BuildRequires:    python3-rtslib
-BuildRequires:    python3-tenacity
-
-
-Requires:         python3-%{service} = %{version}-%{release}
-
-Requires:         python3-pbr
+Source20:         %{service}-sudoers
+Source21:         %{service}.logrotate
+
+BuildRequires:         openstack-macros
+BuildRequires:         python3-os-win
+BuildRequires:         python3-pbr
+BuildRequires:         python3-jsonschema
+BuildRequires:         python3-castellan
+BuildRequires:         python3-cursive
+BuildRequires:         python3-routes
+BuildRequires:         python3-webob
+BuildRequires:         python3-barbicanclient
+BuildRequires:         python3-glanceclient
+BuildRequires:         python3-keystoneclient
+BuildRequires:         python3-novaclient
+BuildRequires:         python3-swiftclient
+BuildRequires:         python3-google-api-client
+BuildRequires:         python3-keystonemiddleware
+BuildRequires:         python3-keystoneauth1
+BuildRequires:         python3-osprofiler
+BuildRequires:         python3-oslo-middleware
+BuildRequires:         python3-oslo-messaging
+BuildRequires:         python3-oslo-policy
+BuildRequires:         python3-oslo-reports
+BuildRequires:         python3-oslo-vmware
+BuildRequires:         python3-oauth2client
+BuildRequires:         python3-packaging
+BuildRequires:         python3-paste
+BuildRequires:         python3-paste-deploy
+BuildRequires:         python3-paramiko
+BuildRequires:         python3-eventlet
+BuildRequires:         python3-greenlet
+BuildRequires:         python3-iso8601
+BuildRequires:         python3-stevedore
+BuildRequires:         python3-tooz
+BuildRequires:         python3-sqlalchemy
+BuildRequires:         python3-six
+BuildRequires:         python3-psutil
+BuildRequires:         python3-os-brick
+BuildRequires:         python3-oslo-config
+BuildRequires:         python3-oslo-concurrency
+BuildRequires:         python3-oslo-context
+BuildRequires:         python3-oslo-db
+BuildRequires:         python3-oslo-i18n
+BuildRequires:         python3-oslo-log
+BuildRequires:         python3-oslo-privsep
+BuildRequires:         python3-oslo-rootwrap
+BuildRequires:         python3-oslo-serialization
+BuildRequires:         python3-oslo-service
+BuildRequires:         python3-oslo-utils
+BuildRequires:         python3-oslo-versionedobjects
+BuildRequires:         python3-oslo-upgradecheck
+BuildRequires:         python3-taskflow
+BuildRequires:         python3-requests
+BuildRequires:         python3-pyparsing
+BuildRequires:         python3-pytz
+BuildRequires:         python3-tabulate
+BuildRequires:         python3-cryptography
+BuildRequires:         python3-lxml
+BuildRequires:         python3-sqlalchemy-migrate
+BuildRequires:         python3-httplib2
+BuildRequires:         python3-tenacity
+BuildRequires:         python3-decorator
+BuildRequires:         python3-rtslib
+BuildRequires:         python3-zstd
+BuildRequires:         python3-importlib_metadata
+BuildRequires:         python3-boto3
+# Needed for unit tests
+BuildRequires:         python3-hacking
+BuildRequires:         python3-flake8-import-order
+BuildRequires:         python3-flake8-logging-format
+BuildRequires:         python3-coverage
+BuildRequires:         python3-PyMySQL
+BuildRequires:         python3-psycopg2
+BuildRequires:         python3-SQLAlchemy-Utils
+BuildRequires:         python3-ddt
+BuildRequires:         python3-fixtures
+BuildRequires:         python3-oslotest
+BuildRequires:         python3-testtools
+BuildRequires:         python3-stestr
+BuildRequires:         python3-bandit
+BuildRequires:         python3-doc8
+BuildRequires:         python3-mypy
+BuildRequires:         python3-moto
 
 Requires:         python3-cinderclient
-
-Requires(pre):    shadow-utils
-
-Requires:         python3-osprofiler
-
 Requires:         python3-pyudev
+Requires(pre):    shadow-utils
+Requires:         openstack-%{service}-api = %{version}-%{release}
+Requires:         openstack-%{service}-scheduler = %{version}-%{release}
+Requires:         openstack-%{service}-volume = %{version}-%{release}
+Requires:         openstack-%{service}-backup = %{version}-%{release}
 
 %description
 %{common_desc}
 
+%package api
+Summary:          OpenStack Volume service (Cinder) - API
+Requires:         %{name}-common = %{version}-%{release}
 
-%package -n       python3-%{service}
-Summary:          OpenStack Volume Python libraries
-%{?python_provide:%python_provide python3-%{service}}
-Group:            Applications/System
-
-Requires:         python3-%{service}-common = %{version}-%{release}
+%description api
+%{common_desc}
+This package contains the %{name} API server.
 
-Requires:         cryptsetup
-Requires:         cracklib-dicts
-Requires:         qemu-img >= 2.10.0
-Requires:         python3-jsonschema >= 2.6.0
+%package scheduler
+Summary:          OpenStack Volume service (Cinder) - Scheduler
+Requires:         %{name}-common = %{version}-%{release}
 
-Requires:         python3-castellan >= 1.3.0
-Requires:         python3-cursive >= 0.2.1
-Requires:         python3-etcd3gw
+%description scheduler
+%{common_desc}
+This package contains the %{name} Scheduler server.
 
-Requires:         python3-routes >= 2.3.1
-Requires:         python3-webob >= 1.7.1
+%package volume
+Summary:          OpenStack Volume service (Cinder) - Volume
+Requires:         %{name}-common = %{version}-%{release}
 
-Requires:         python3-barbicanclient >= 4.9.0
-Requires:         python3-glanceclient >= 2.15.0
-Requires:         python3-keystoneclient >= 3.15.0
-Requires:         python3-novaclient >= 9.1.0
-Requires:         python3-swiftclient >= 3.2.0
+%description volume
+%{common_desc}
+This package contains the %{name} Volume server.
 
-Requires:         python3-google-api-client >= 1.4.2
+%package backup
+Summary:          OpenStack Volume service (Cinder) - Backup
+Requires:         %{name}-common = %{version}-%{release}
+Requires:         targetcli
 
-Requires:         python3-keystonemiddleware >= 4.21.0
-Requires:         python3-keystoneauth1 >= 3.14.0
-Requires:         python3-osprofiler >= 1.4.0
+%description backup
+%{common_desc}
+This package contains the %{name} Backup server.
 
-Requires:         python3-os-win >= 4.2.0
+%package common
+Summary:          OpenStack Volume service (Cinder) - Common
+Requires:         python3-cinder = %{version}-%{release}
 
-Requires:         python3-oslo-middleware >= 3.31.0
-Requires:         python3-oslo-messaging >= 6.4.0
-Requires:         python3-oslo-policy >= 1.44.1
-Requires:         python3-oslo-reports >= 1.18.0
-Requires:         python3-oslo-upgradecheck >= 0.1.0
-Requires:         python3-oslo-vmware >= 2.35.0
+%description common
+%{common_desc}
+This package contains scripts, config and dependencies shared between all the ${name} services
 
-Requires:         python3-oauth2client >= 1.5.0
+%package -n python3-%{service}
+Summary:          OpenStack Volume Python libraries
+Requires:         python3-os-win
+Requires:         python3-pbr
+Requires:         python3-jsonschema
+Requires:         python3-castellan
+Requires:         python3-cursive
+Requires:         python3-routes
+Requires:         python3-webob
+Requires:         python3-barbicanclient
+Requires:         python3-glanceclient
+Requires:         python3-keystoneclient
+Requires:         python3-novaclient
+Requires:         python3-swiftclient
+Requires:         python3-google-api-client
+Requires:         python3-keystonemiddleware
+Requires:         python3-keystoneauth1
+Requires:         python3-osprofiler
+Requires:         python3-oslo-middleware
+Requires:         python3-oslo-messaging
+Requires:         python3-oslo-policy
+Requires:         python3-oslo-reports
+Requires:         python3-oslo-vmware
+Requires:         python3-oslo-upgradecheck
+Requires:         python3-oauth2client
 Requires:         python3-packaging
 Requires:         python3-paste
 Requires:         python3-paste-deploy
-
-%description -n   python3-%{service}
-%{common_desc}
-
-This package contains the %{service} Python library.
-
-%package -n python3-%{service}-common
-Summary:        Cinder common code
-%{?python_provide:%python_provide python3-%{service}-common}
-
-Requires:         sudo
-
-Requires:         sysfsutils
-Requires:         python3-paramiko >= 2.7.1
-
-Requires:         python3-eventlet >= 0.25.0
-Requires:         python3-greenlet >= 0.4.13
-Requires:         python3-iso8601 
-Requires:         python3-stevedore >= 1.31.0
-Requires:         python3-tooz >= 1.58.0
-
+Requires:         python3-paramiko
+Requires:         python3-eventlet
+Requires:         python3-greenlet
+Requires:         python3-iso8601
+Requires:         python3-stevedore
+Requires:         python3-tooz
 Requires:         python3-sqlalchemy
-
-Requires:         python3-six >= 1.11.0
-Requires:         python3-psutil >= 3.2.2
-
-Requires:         python3-os-brick >= 4.0.1
-Requires:         python3-oslo-config 
-Requires:         python3-oslo-concurrency >= 3.26.0
-Requires:         python3-oslo-context >= 2.23.0
-Requires:         python3-oslo-db >= 6.0.0
-Requires:         python3-oslo-i18n >= 3.24.0
-Requires:         python3-oslo-log >= 3.44.0
-Requires:         python3-oslo-privsep >= 2.3.0
-Requires:         python3-oslo-rootwrap >= 5.8.0
-Requires:         python3-oslo-serialization >= 2.25.0
-Requires:         python3-oslo-service >= 2.0.0
-Requires:         python3-oslo-utils >= 3.40.2
-Requires:         python3-oslo-versionedobjects >= 1.31.2
-Requires:         python3-zstd >= 1.4.5
-Requires:         python3-importlib_metadata
-
-Requires:         python3-taskflow >= 3.8.0
-
-Requires:         iscsi-initiator-utils
-
-Requires:         python3-requests >= 2.18.0
-Requires:         python3-pyparsing >= 2.2.1
+Requires:         python3-six
+Requires:         python3-psutil
+Requires:         python3-os-brick
+Requires:         python3-oslo-config
+Requires:         python3-oslo-concurrency
+Requires:         python3-oslo-context
+Requires:         python3-oslo-db
+Requires:         python3-oslo-i18n
+Requires:         python3-oslo-log
+Requires:         python3-oslo-privsep
+Requires:         python3-oslo-rootwrap
+Requires:         python3-oslo-serialization
+Requires:         python3-oslo-service
+Requires:         python3-oslo-utils
+Requires:         python3-oslo-versionedobjects
+Requires:         python3-taskflow
+Requires:         python3-requests
+Requires:         python3-pyparsing
 Requires:         python3-pytz
-Requires:         python3-tabulate >= 0.8.5
-
-Requires:         python3-cryptography >= 2.1.4
-
-
-Requires:         python3-lxml >= 4.2.0
-Requires:         python3-sqlalchemy-migrate >= 0.13.0
-Requires:         python3-httplib2 >= 0.9.1
+Requires:         python3-tabulate
+Requires:         python3-cryptography
+Requires:         python3-lxml
+Requires:         python3-sqlalchemy-migrate
+Requires:         python3-httplib2
 Requires:         python3-tenacity
 Requires:         python3-decorator
-
-Requires:         lvm2
 Requires:         python3-rtslib
+Requires:         lvm2
+Requires:         sudo
+Requires:         sysfsutils
+Requires:         cryptsetup
+Requires:         cracklib-dicts
+Requires:         qemu-img
+Requires:         iscsi-initiator-utils
+Requires:         python3-zstd
+Requires:         python3-importlib_metadata
+Requires:         python3-boto3
 
-
-%description -n   python3-%{service}-common
-Common code for Cinder.
+%description -n python3-%{service}
+%{common_desc}
+This package contains the %{service} Python library.
 
 %package -n python3-%{service}-tests
 Summary:        Cinder tests
-%{?python_provide:%python_provide python3-%{service}-tests}
-Requires:       openstack-%{service} = %{version}-%{release}
 
 Requires:       python3-hacking
+Requires:       python3-flake8-import-order
+Requires:       python3-flake8-logging-format
+Requires:       python3-coverage
+Requires:       python3-PyMySQL
+Requires:       python3-psycopg2
+Requires:       python3-SQLAlchemy-Utils
 Requires:       python3-ddt
 Requires:       python3-fixtures
-Requires:       python3-mock
 Requires:       python3-oslotest
 Requires:       python3-subunit
 Requires:       python3-testtools
-Requires:       python3-testrepository
-Requires:       python3-testresources
-Requires:       python3-testscenarios
 Requires:       python3-stestr
-
+Requires:       python3-bandit
+Requires:       python3-doc8
+Requires:       python3-mypy
+Requires:       python3-moto
+Requires:       python3-%{service}
 
 %description -n python3-%{service}-tests
 %{common_desc}
-
 This package contains the Cinder test files.
 
-%if 0%{?with_doc}
-%package doc
-Summary:          Documentation for OpenStack Volume
-Group:            Documentation
-
-Requires:         %{name} = %{version}-%{release}
-
-BuildRequires:    graphviz
-BuildRequires:    python3-sphinx
-BuildRequires:    python3-openstackdocstheme
-BuildRequires:    python3-sphinxcontrib-apidoc
-BuildRequires:    python3-sphinx-feature-classification
-BuildRequires:    python3-eventlet
-BuildRequires:    python3-routes
-BuildRequires:    python3-sqlalchemy
-BuildRequires:    python3-webob
-BuildRequires:    python3-iso8601 >= 0.1.9
-
-BuildRequires:    python3-sqlalchemy-migrate
-
-%description      doc
-%{common_desc}
-
-This package contains documentation files for %{service}.
-%endif
-
 %prep
-%autosetup -n %{service}-%{upstream_version} -p1
-
-find . \( -name .gitignore -o -name .placeholder \) -delete
-
-find %{service} -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
-sed -i 's/\/usr\/bin\/env python/\/usr\/bin\/env python3/' tools/generate_driver_list.py
-
-sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
-
+%autosetup -n %{service}-%{version}
 %py_req_cleanup
 
 %build
-PYTHONPATH=. oslo-config-generator --config-file=tools/config/%{service}-config-generator.conf
-
 %{py3_build}
-
-%{__python3} setup.py compile_catalog -d build/lib/%{service}/locale -D cinder
+oslo-config-generator --config-file=tools/config/%{service}-config-generator.conf
 
 %install
 %{py3_install}
-
-export PYTHONPATH="$( pwd ):$PYTHONPATH"
-
-%if 0%{?with_doc}
-sphinx-build -b html doc/source doc/build/html
-rm -fr doc/build/html/.{doctrees,buildinfo}
-sphinx-build -b man doc/source doc/build/man
-mkdir -p %{buildroot}%{_mandir}/man1
-install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/
-%endif
-
-
 install -d -m 755 %{buildroot}%{_sharedstatedir}/%{service}
 install -d -m 755 %{buildroot}%{_sharedstatedir}/%{service}/tmp
-install -d -m 755 %{buildroot}%{_localstatedir}/log/%{service}
-
 install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}
-install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/%{service}/%{service}-dist.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d
 install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}/volumes
+install -d -m 755 %{buildroot}%{_localstatedir}/log/%{service}
+install -d -m 755 %{buildroot}%{_localstatedir}/run/%{service}
+install -d -m 755 %{buildroot}%{_datarootdir}
+install -d -m 755 %{buildroot}%{_datarootdir}/%{service}
+install -d -m 755 %{buildroot}%{_datarootdir}/%{service}/rootwrap/
+install -p -D -m 640 %{SOURCE10} %{buildroot}%{_unitdir}/openstack-%{service}-api.service
+install -p -D -m 640 %{SOURCE11} %{buildroot}%{_unitdir}/openstack-%{service}-scheduler.service
+install -p -D -m 640 %{SOURCE12} %{buildroot}%{_unitdir}/openstack-%{service}-volume.service
+install -p -D -m 640 %{SOURCE13} %{buildroot}%{_unitdir}/openstack-%{service}-backup.service
+install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/%{service}
+install -p -D -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-%{service}
 install -p -D -m 640 etc/%{service}/rootwrap.conf %{buildroot}%{_sysconfdir}/%{service}/rootwrap.conf
 install -p -D -m 640 etc/%{service}/api-paste.ini %{buildroot}%{_sysconfdir}/%{service}/api-paste.ini
-install -p -D -m 640 etc/%{service}/resource_filters.json %{buildroot}%{_sysconfdir}/%{service}/resource_filters.json
 install -p -D -m 640 etc/%{service}/%{service}.conf.sample %{buildroot}%{_sysconfdir}/%{service}/%{service}.conf
-
-install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/openstack-%{service}-api.service
-install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/openstack-%{service}-scheduler.service
-install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/openstack-%{service}-volume.service
-install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/openstack-%{service}-backup.service
-
-install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/%{service}
-
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-%{service}
-
-install -d -m 755 %{buildroot}%{_localstatedir}/run/%{service}
-
-mkdir -p %{buildroot}%{_datarootdir}/%{service}/rootwrap/
-install -p -D -m 644 etc/%{service}/rootwrap.d/* %{buildroot}%{_datarootdir}/%{service}/rootwrap/
-
-
-mkdir -p %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d
-for filter in %{_datarootdir}/os-brick/rootwrap/*.filters; do
-ln -s $filter %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d/
-done
-
-install -d -m 755 %{buildroot}%{_datadir}
+install -p -D -m 640 etc/%{service}/resource_filters.json %{buildroot}%{_sysconfdir}/%{service}/resource_filters.json
+install -p -D -m 640 etc/%{service}/rootwrap.d/* %{buildroot}%{_datarootdir}/%{service}/rootwrap/
 rm -f %{buildroot}%{python3_sitelib}/%{service}/locale/*/LC_*/%{service}*po
 rm -f %{buildroot}%{python3_sitelib}/%{service}/locale/*pot
-mv %{buildroot}%{python3_sitelib}/%{service}/locale %{buildroot}%{_datadir}/locale
-
-%find_lang %{service} --all-name
-
-rm -f %{buildroot}/usr/share/doc/%{service}/README*
-
+mv %{buildroot}%{python3_sitelib}/%{service}/locale %{buildroot}%{_datarootdir}/locale
 rm -rf %{buildroot}%{_prefix}/etc
 
-%if 0%{!?dlrn}
-%check
-OS_TEST_PATH=./%{service}/tests/unit ostestr --concurrency=2
-%endif
+#%check
+#OS_TEST_PATH=./%{service}/tests/unit ostestr --concurrency=2
 
-%pre
-getent group %{service} >/dev/null || groupadd -r %{service} --gid 165
-if ! getent passwd %{service} >/dev/null; then
-  useradd -u 165 -r -g %{service} -G %{service},nobody -d %{_sharedstatedir}/%{service} -s /sbin/nologin -c "OpenStack Cinder Daemons" %{service}
-fi
+%pre common
+%openstack_pre_user_group_create %{service} %{service} /sbin/nologin
 exit 0
 
-%post
+%post volume
 %systemd_post openstack-%{service}-volume
+%post api
 %systemd_post openstack-%{service}-api
+%post scheduler
 %systemd_post openstack-%{service}-scheduler
+%post backup
 %systemd_post openstack-%{service}-backup
 
-%preun
+%preun volume
 %systemd_preun openstack-%{service}-volume
+%preun api
 %systemd_preun openstack-%{service}-api
+%preun scheduler
 %systemd_preun openstack-%{service}-scheduler
+%preun backup
 %systemd_preun openstack-%{service}-backup
 
-%postun
+%postun volume
 %systemd_postun_with_restart openstack-%{service}-volume
+%postun api
 %systemd_postun_with_restart openstack-%{service}-api
+%postun scheduler
 %systemd_postun_with_restart openstack-%{service}-scheduler
+%postun backup
 %systemd_postun_with_restart openstack-%{service}-backup
 
 %files
-%dir %{_sysconfdir}/%{service}
-%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/%{service}.conf
-%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/api-paste.ini
-%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/rootwrap.conf
-%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/resource_filters.json
-%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-%{service}
-%config(noreplace) %{_sysconfdir}/sudoers.d/%{service}
-%{_sysconfdir}/%{service}/rootwrap.d/
-%attr(-, root, %{service}) %{_datadir}/%{service}/%{service}-dist.conf
-
-%dir %attr(0750, %{service}, root) %{_localstatedir}/log/%{service}
-%dir %attr(0755, %{service}, root) %{_localstatedir}/run/%{service}
-%dir %attr(0755, %{service}, root) %{_sysconfdir}/%{service}/volumes
-
-%exclude %{_bindir}/%{service}-rtstool
-%{_bindir}/%{service}-*
-%{_unitdir}/*.service
-%{_datarootdir}/%{service}
-%if 0%{?with_doc}
-%{_mandir}/man1/%{service}*.1.gz
-%endif
 
-%defattr(-, %{service}, %{service}, -)
-%dir %{_sharedstatedir}/%{service}
-%dir %{_sharedstatedir}/%{service}/tmp
+%files api
+%{_bindir}/cinder-api
+%{_unitdir}/openstack-cinder-api.service
 
-%files -n python3-%{service}
+%files scheduler
+%{_bindir}/cinder-scheduler
+%{_unitdir}/openstack-cinder-scheduler.service
+
+%files volume
+%{_bindir}/cinder-volume
+%{_unitdir}/openstack-cinder-volume.service
+
+%files backup
+%{_bindir}/cinder-backup
+%{_unitdir}/openstack-cinder-backup.service
 
-%files -n python3-%{service}-common -f %{service}.lang
+%files common
+%license LICENSE
+%dir %attr(0750, %{service}, %{service}) %{_sysconfdir}/%{service}
+%dir %attr(0750, %{service}, %{service}) %{_sysconfdir}/%{service}/volumes
+%dir %attr(0750, %{service}, %{service}) %{_localstatedir}/log/%{service}
+%dir %attr(0750, %{service}, %{service}) %{_localstatedir}/run/%{service}
+%dir %attr(0750, %{service}, %{service}) %{_sharedstatedir}/%{service}
+%dir %attr(0750, %{service}, %{service}) %{_sharedstatedir}/%{service}/tmp
+%attr(-, %{service}, %{service}) %{_sysconfdir}/%{service}/rootwrap.d/
+%attr(-, %{service}, %{service}) %{_datarootdir}/%{service}
+%attr(0640, root, %{service}) %{_sysconfdir}/logrotate.d/openstack-%{service}
+%attr(0440, root, root) %{_sysconfdir}/sudoers.d/%{service}
+%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/%{service}.conf
+%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/api-paste.ini
+%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/rootwrap.conf
+%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/resource_filters.json
+%{_bindir}/%{service}-*
+%exclude %{_bindir}/%{service}-api
+%exclude %{_bindir}/%{service}-scheduler
+%exclude %{_bindir}/%{service}-volume
+%exclude %{_bindir}/%{service}-backup
+
+%files -n python3-%{service}
 %license LICENSE
 %{python3_sitelib}/%{service}
 %{python3_sitelib}/%{service}-*.egg-info
@@ -412,12 +380,10 @@ exit 0
 %license LICENSE
 %{python3_sitelib}/%{service}/tests
 
-%if 0%{?with_doc}
-%files doc
-%doc doc/build/html
-%endif
-
 %changelog
+* Thu Aug 12 2021 wangxiyuan <wangxiyuan1007@gmail.com> - 18.0.0-1
+- Upgrade to OpenStack Wallaby version
+
 * Fri Aug 06 2021 wangxiyuan <wangxiyuan1007@gmail.com> - 17.0.0-4
 - Remove epoch tag