Removing extra apache2 service from volume.sls
The patch removes extra lines to delete action which
added apache2 service for new releases and was added
due to some reason or by mistake.
Change-Id: I607b49f96e4f9664ef468ab5c6705c95fd9125c1
diff --git a/cinder/map.jinja b/cinder/map.jinja
index 84cc654..1b3cb32 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -16,17 +16,17 @@
'audit': {
'enabled': false
},
- 'cinder_uid': 304,
- 'cinder_gid': 304,
- 'message_queue': {
- 'rpc_response_timeout': 3600,
- 'control_exchange': 'cinder'
- },
- 'enable_proxy_headers_parsing': true,
- 'backup': {
- 'pkgs': ['cinder-backup'],
- 'services': ['cinder-backup'],
- 'engine': None
+ 'cinder_uid': 304,
+ 'cinder_gid': 304,
+ 'message_queue': {
+ 'rpc_response_timeout': 3600,
+ 'control_exchange': 'cinder'
+ },
+ 'enable_proxy_headers_parsing': true,
+ 'backup': {
+ 'pkgs': ['cinder-backup'],
+ 'services': ['cinder-backup'],
+ 'engine': None
},
'logging': {
'log_appender': false,
@@ -46,13 +46,13 @@
'audit': {
'enabled': false
},
- 'cinder_uid': 304,
- 'cinder_gid': 304,
- 'message_queue': {
- 'rpc_response_timeout': 3600,
- 'control_exchange': 'cinder'
- },
- 'enable_proxy_headers_parsing': true,
+ 'cinder_uid': 304,
+ 'cinder_gid': 304,
+ 'message_queue': {
+ 'rpc_response_timeout': 3600,
+ 'control_exchange': 'cinder'
+ },
+ 'enable_proxy_headers_parsing': true,
'backup': {
'pkgs': ['cinder-backup'],
'services': ['cinder-backup'],
@@ -79,13 +79,17 @@
'audit': {
'enabled': false
},
- 'cinder_uid': 304,
- 'cinder_gid': 304,
+ 'cinder_uid': 304,
+ 'cinder_gid': 304,
'backup': {
'pkgs': ['cinder-backup'],
'services': ['cinder-backup'],
'engine': None
},
+ 'message_queue': {
+ 'rpc_response_timeout': 3600,
+ 'control_exchange': 'cinder'
+ },
'logging': {
'log_appender': false,
'log_handlers': {
@@ -103,8 +107,12 @@
'audit': {
'enabled': false
},
- 'cinder_uid': 304,
- 'cinder_gid': 304,
+ 'cinder_uid': 304,
+ 'cinder_gid': 304,
+ 'message_queue': {
+ 'rpc_response_timeout': 3600,
+ 'control_exchange': 'cinder'
+ },
'backup': {
'pkgs': ['cinder-backup'],
'services': ['cinder-backup'],
diff --git a/cinder/volume.sls b/cinder/volume.sls
index cdc40fd..c7e8276 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -6,10 +6,6 @@
{%- include "cinder/user.sls" %}
{%- endif %}
-{%- if volume.version not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata", "pike"] %}
- {%- do volume.services.append('apache2') %}
-{%- endif %}
-
cinder_volume_packages:
pkg.installed:
- names: {{ volume.pkgs }}