diff --git a/.kitchen.yml b/.kitchen.yml
index 222da18..a00d4ec 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,6 +18,9 @@
     - name: linux
       repo: git
       source: https://github.com/salt-formulas/salt-formula-linux
+    - name: apache
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-apache
     - name: keystone
       repo: git
       source: https://github.com/salt-formulas/salt-formula-keystone
@@ -25,6 +28,7 @@
     base:
       "*":
         - linux.system
+        - apache
         - cinder
   pillars:
     top.sls:
@@ -79,6 +83,11 @@
             volume:
               enabled: false
 
+  - name: control_cluster
+    provisioner:
+      pillars-from-files:
+        cinder.sls: tests/pillar/control_cluster_intree_wsgi.sls
+
   - name: gpfs_single
     provisioner:
       pillars-from-files:
diff --git a/README.rst b/README.rst
index a54683b..1914361 100644
--- a/README.rst
+++ b/README.rst
@@ -682,6 +682,16 @@
         barbican:
           enabled: true
 
+
+Specify Keystone API version (v3 is default):
+
+.. code-block:: yaml
+
+    cinder:
+      controller:
+        identity:
+          api_version: v2.0
+
 Enhanced logging with logging.conf
 ----------------------------------
 
diff --git a/_modules/cinderng.py b/_modules/cinderng.py
index 71d7c5c..08aaad9 100644
--- a/_modules/cinderng.py
+++ b/_modules/cinderng.py
@@ -32,10 +32,11 @@
         'username': profile['user'],
         'password': profile['password'],
         'project_id': profile['project_id'],
-        'auth_url': "{}://{}:{}/v2.0".format(
+        'auth_url': "{}://{}:{}/{}".format(
             profile['protocol'],
             profile['host'],
-            profile['port']
+            profile['port'],
+            profile.get('api_version', 'v3')
         ),
         'endpoint_type': profile['endpoint_type'],
         'certificate': profile['certificate'],
diff --git a/cinder/client.sls b/cinder/client.sls
index 865df36..c104985 100644
--- a/cinder/client.sls
+++ b/cinder/client.sls
@@ -11,6 +11,18 @@
 {%- set identity = salt['pillar.get']('keystone:client:server:'+client.identity) %}
 {%- endif %}
 
+{#- Keystone V3 is supported only from Ocata release (https://docs.openstack.org/releasenotes/python-cinderclient/ocata.html) #}
+{#- Therefore if api_version is not defined and OpenStack version is mitaka or newton use v2.0. #}
+{%- if 'api_version' in identity %}
+{%- set keystone_api_version = identity.get('api_version') %}
+{%- else %} 
+{%- if 'version' in client and client.version in ['mitaka', 'newton'] %}
+{%- set keystone_api_version = 'v2.0' %}
+{%- else %}
+{%- set keystone_api_version = 'v3' %}
+{%- endif %}
+{%- endif %}
+
 {%- set credentials = {'host': identity.host,
                        'user': identity.user,
                        'password': identity.password,
@@ -19,7 +31,8 @@
                        'protocol': identity.get('protocol', 'http'),
                        'region_name': identity.get('region_name', 'RegionOne'),
                        'endpoint_type': identity.get('endpoint_type', 'internalURL'),
-                       'certificate': identity.get('certificate', client.cacert_file)} %}
+                       'certificate': identity.get('certificate', client.cacert_file),
+                       'api_version': keystone_api_version} %}
 
 {%- for backend_name, backend in client.get('backend', {}).items() %}
 
diff --git a/cinder/controller.sls b/cinder/controller.sls
index 07772bd..fc660de 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -152,10 +152,15 @@
   - require_in:
     - service: cinder_controller_services
 
-{%- if controller.version in ('ocata','pike') %}
+{%- if controller.version not in ['mitaka','newton'] %}
+include:
+  - apache
+{#- Creation of sites using templates is deprecated, sites should be generated by apache pillar, and enabled by cinder formula #}
+{%- if pillar.get('apache', {}).get('server', {}).get('site', {}).cinder is not defined %}
 
-/etc/apache2/conf-available/cinder-wsgi.conf:
+cinder_apache_conf_file:
   file.managed:
+  - name: /etc/apache2/conf-available/cinder-wsgi.conf
   - source: salt://cinder/files/{{ controller.version }}/cinder-wsgi.conf
   - template: jinja
   - require:
@@ -164,6 +169,36 @@
 apache_enable_cinder_wsgi:
   apache_conf.enabled:
     - name: cinder-wsgi
+    - require:
+      - cinder_apache_conf_file
+
+{%- else %}
+
+cleanup_configs:
+  file.absent:
+    - names: ['/etc/apache2/conf-available/cinder-wsgi.conf', '/etc/apache2/conf-enabled/cinder-wsgi.conf']
+
+cinder_apache_conf_file:
+  file.exists:
+  - name: /etc/apache2/sites-available/wsgi_cinder.conf
+  - require:
+    - pkg: cinder_controller_packages
+    - cleanup_configs
+
+apache_enable_cinder_wsgi:
+  apache_site.enabled:
+    - name: wsgi_cinder
+    - require:
+      - cinder_apache_conf_file
+
+{%- endif %}
+
+cinder_api_service_dead:
+  service.dead:
+    - name: cinder-api
+    - enable: False
+    - require:
+      - pkg: cinder_controller_packages
 
 cinder_api_service:
   service.running:
@@ -174,6 +209,7 @@
   {%- endif %}
   - require:
     - pkg: cinder_controller_packages
+    - service: cinder_api_service_dead
   - watch:
     {%- if controller.message_queue.get('ssl',{}).get('enabled', False) %}
     - file: rabbitmq_ca_cinder_controller
@@ -183,7 +219,8 @@
     {%- endif %}
     - file: /etc/cinder/cinder.conf
     - file: /etc/cinder/api-paste.ini
-    - file: /etc/apache2/conf-available/cinder-wsgi.conf
+    - cinder_apache_conf_file
+    - apache_enable_cinder_wsgi
 
 {%- else %}
 
@@ -242,6 +279,19 @@
 {%- if not grains.get('noservices', False) %}
 
 {%- set identity = controller.identity %}
+
+{#- Keystone V3 is supported only from Ocata release (https://docs.openstack.org/releasenotes/python-cinderclient/ocata.html) #}
+{#- Therefore if api_version is not defined and OpenStack version is mitaka or newton use v2.0. #}
+{%- if 'api_version' in identity %}
+{%- set keystone_api_version = identity.get('api_version') %}
+{%- else %} 
+{%- if 'version' in controller and controller.version in ['mitaka', 'newton'] %}
+{%- set keystone_api_version = 'v2.0' %}
+{%- else %}
+{%- set keystone_api_version = 'v3' %}
+{%- endif %}
+{%- endif %}
+
 {%- set credentials = {'host': identity.host,
                        'user': identity.user,
                        'password': identity.password,
@@ -250,7 +300,8 @@
                        'protocol': identity.get('protocol', 'http'),
                        'region_name': identity.get('region_name', 'RegionOne'),
                        'endpoint_type': identity.get('endpoint_type', 'internalURL'),
-                       'certificate': identity.get('certificate', controller.cacert_file)} %}
+                       'certificate': identity.get('certificate', controller.cacert_file),
+                       'api_version': keystone_api_version} %}
 
 {%- for backend_name, backend in controller.get('backend', {}).items() %}
 
diff --git a/cinder/files/backend/_nfs.conf b/cinder/files/backend/_nfs.conf
index 26e8e66..8d82497 100644
--- a/cinder/files/backend/_nfs.conf
+++ b/cinder/files/backend/_nfs.conf
@@ -9,3 +9,16 @@
 nfs_mount_point_base = {{ backend.get('path', '/mnt') }}
 nfs_shares_config = /etc/cinder/nfs_shares_{{ backend_name }}
 nfs_sparsed_volumes = True
+
+{%- if backend.nas_secure_file_operations is defined %}
+nas_secure_file_operations = {{ backend.nas_secure_file_operations }}
+{%- endif %}
+
+{%- if backend.nas_secure_file_permissions is defined %}
+nas_secure_file_permissions = {{ backend.nas_secure_file_permissions }}
+{%- endif %}
+
+{%- if backend.nfs_snapshot_support is defined %}
+nfs_snapshot_support = {{ backend.nfs_snapshot_support }}
+{%- endif %}
+
diff --git a/metadata.yml b/metadata.yml
index 3a8709d..89be788 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -4,3 +4,5 @@
 dependencies:
   - name: keystone
     source: "https://github.com/salt-formulas/salt-formula-keystone"
+  - name: apache
+    source: "https://github.com/salt-formulas/salt-formula-apache"
diff --git a/tests/pillar/ceph_single.sls b/tests/pillar/ceph_single.sls
index d996ad2..bc15f19 100644
--- a/tests/pillar/ceph_single.sls
+++ b/tests/pillar/ceph_single.sls
@@ -25,6 +25,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -83,3 +92,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 4ab6e8e..a9628fb 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -23,6 +23,15 @@
     glance:
       host: 127.0.0.1
       port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     message_queue:
       engine: rabbitmq
       members:
@@ -54,3 +63,45 @@
     policy:
       'volume:delete': 'rule:admin_or_owner'
       'volume:extend':
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/control_cluster_intree_wsgi.sls b/tests/pillar/control_cluster_intree_wsgi.sls
new file mode 100644
index 0000000..4c078d4
--- /dev/null
+++ b/tests/pillar/control_cluster_intree_wsgi.sls
@@ -0,0 +1,80 @@
+cinder:
+  controller:
+    enabled: true
+    version: liberty
+    osapi:
+      host: 127.0.0.1
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: password
+    identity:
+      engine: keystone
+      region: RegionOne
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: password
+      endpoint_type: internalURL
+    glance:
+      host: 127.0.0.1
+      port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
+    message_queue:
+      engine: rabbitmq
+      members:
+      - host: 127.0.0.1
+      - host: 127.0.1.1
+      - host: 127.0.2.1
+      user: openstack
+      password: password
+      virtual_host: '/openstack'
+    cache:
+      engine: memcached
+      members:
+      - host: 127.0.0.1
+        port: 11211
+      - host: 127.0.0.1
+        port: 11211
+      - host: 127.0.0.1
+        port: 11211
+    storage:
+      engine: storwize
+      host: 192.168.0.1
+      port: 22
+      user: username
+      password: pass
+
+    audit:
+      filter_factory: 'keystonemiddleware.audit:filter_factory'
+      map_file: '/etc/pycadf/cinder_api_audit_map.conf'
+    policy:
+      'volume:delete': 'rule:admin_or_owner'
+      'volume:extend':
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index ac8db5a..24784bc 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -23,6 +23,15 @@
     glance:
       host: 127.0.0.1
       port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
@@ -39,3 +48,45 @@
     policy:
       'volume:delete': 'rule:admin_or_owner'
       'volume:extend':
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/gpfs_single.sls b/tests/pillar/gpfs_single.sls
index f77608d..4491ac6 100644
--- a/tests/pillar/gpfs_single.sls
+++ b/tests/pillar/gpfs_single.sls
@@ -24,6 +24,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -65,6 +74,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -80,3 +98,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/hp3par_single.sls b/tests/pillar/hp3par_single.sls
index 774c934..02ef0c3 100644
--- a/tests/pillar/hp3par_single.sls
+++ b/tests/pillar/hp3par_single.sls
@@ -30,6 +30,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -75,6 +84,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -90,3 +108,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/lefthand_single.sls b/tests/pillar/lefthand_single.sls
index ffec435..024f2bc 100644
--- a/tests/pillar/lefthand_single.sls
+++ b/tests/pillar/lefthand_single.sls
@@ -24,6 +24,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -65,6 +74,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -80,3 +98,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/netapp.sls b/tests/pillar/netapp.sls
index 1f72880..4a81fee 100644
--- a/tests/pillar/netapp.sls
+++ b/tests/pillar/netapp.sls
@@ -17,6 +17,15 @@
       user: cinder
       password: pwd
       region: regionOne
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     database:
       engine: mysql
       host: 127.0.0.1
diff --git a/tests/pillar/nfs.sls b/tests/pillar/nfs.sls
index 9cec3cb..c0edf25 100644
--- a/tests/pillar/nfs.sls
+++ b/tests/pillar/nfs.sls
@@ -18,6 +18,15 @@
       user: cinder
       password: pwd
       region: regionOne
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     database:
       engine: mysql
       host: 127.0.0.1
@@ -58,3 +67,45 @@
         engine: nfs
         type_name: nfs-driver
         volume_group: cinder-volume
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/solidfire_single.sls b/tests/pillar/solidfire_single.sls
index ecb5982..9d2c180 100644
--- a/tests/pillar/solidfire_single.sls
+++ b/tests/pillar/solidfire_single.sls
@@ -25,6 +25,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -66,6 +75,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -81,3 +99,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/storwize_single.sls b/tests/pillar/storwize_single.sls
index 01cd8b9..f1b6c49 100644
--- a/tests/pillar/storwize_single.sls
+++ b/tests/pillar/storwize_single.sls
@@ -49,6 +49,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -115,6 +124,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -130,3 +148,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/volume_single.sls b/tests/pillar/volume_single.sls
index e86b45f..d243510 100644
--- a/tests/pillar/volume_single.sls
+++ b/tests/pillar/volume_single.sls
@@ -23,6 +23,15 @@
     glance:
       host: 127.0.0.1
       port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
@@ -36,3 +45,45 @@
       port: 22
       user: username
       password: pass
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/volume_single_barbican.sls b/tests/pillar/volume_single_barbican.sls
index 5f28d06..e1da081 100644
--- a/tests/pillar/volume_single_barbican.sls
+++ b/tests/pillar/volume_single_barbican.sls
@@ -25,6 +25,15 @@
     glance:
       host: 127.0.0.1
       port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
@@ -38,3 +47,45 @@
       port: 22
       user: username
       password: pass
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'
diff --git a/tests/pillar/vsp_single.sls b/tests/pillar/vsp_single.sls
index 3258ab7..8e5ab5c 100644
--- a/tests/pillar/vsp_single.sls
+++ b/tests/pillar/vsp_single.sls
@@ -29,6 +29,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -66,6 +75,15 @@
     glance:
         host: 127.0.0.1
         port: 9292
+    logging:
+      log_appender: false
+      log_handlers:
+        watchedfile:
+          enabled: true
+        fluentd:
+          enabled: false
+        ossyslog:
+          enabled: false
     default_volume_type: 7k2SaS
     message_queue:
       engine: rabbitmq
@@ -81,3 +99,45 @@
       name: cinder
       user: cinder
       password: pwd
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      cinder:
+        enabled: false
+        available: true
+        type: wsgi
+        name: cinder
+        wsgi:
+          daemon_process: cinder-wsgi
+          processes: 5
+          threads: 1
+          user: cinder
+          group: cinder
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/cinder-wsgi'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8776
+        log:
+          custom:
+            format: >-
+              %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+          error:
+            enabled: true
+            format: '%M'