Merge "Disable Options Indexes in horizon"

diff --combined puppet/services/horizon.yaml
index f9b1934,bae3fc0..8eaf404
--- 1/puppet/services/horizon.yaml
--- 2/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@@ -59,13 -59,13 +59,14 @@@ outputs
                  - 80
                  - 443
            horizon::disable_password_reveal: true
 +          horizon::enforce_password_check: true
            horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
            horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
            horizon::vhost_extra_params:
              add_listen: false
              priority: 10
              access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
+             options: ['FollowSymLinks','MultiViews']
            horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
            horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
            horizon::secret_key: