diff options
| -rw-r--r-- | manifests/profile/base/glance/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 44 | ||||
| -rw-r--r-- | manifests/ssl/cinder_config.pp | 28 |
3 files changed, 45 insertions, 29 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index ad59a38..fd43732 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -46,7 +46,7 @@ class tripleo::profile::base::glance::api ( include ::glance include ::glance::config class { '::glance::api': - known_stores => $glance_store, + stores => $glance_store, } include ::glance::notify::rabbitmq include join(['::glance::backend::', $glance_backend]) diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp new file mode 100644 index 0000000..58e2b6f --- /dev/null +++ b/manifests/profile/base/swift/proxy.pp @@ -0,0 +1,44 @@ +# Copyright 2016 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::swift::proxy +# +# Swift proxy profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# +class tripleo::profile::base::swift::proxy ( + $step = hiera('step'), +) { + + if $step >= 4 { + include ::swift::proxy + include ::swift::proxy::proxy_logging + include ::swift::proxy::healthcheck + include ::swift::proxy::cache + include ::swift::proxy::keystone + include ::swift::proxy::authtoken + include ::swift::proxy::staticweb + include ::swift::proxy::ratelimit + include ::swift::proxy::catch_errors + include ::swift::proxy::tempurl + include ::swift::proxy::formpost + } +} diff --git a/manifests/ssl/cinder_config.pp b/manifests/ssl/cinder_config.pp deleted file mode 100644 index e1ed113..0000000 --- a/manifests/ssl/cinder_config.pp +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# == Class: tripleo::ssl::cinder_config -# -# Enable SSL middleware for the cinder service's pipeline. -# - -class tripleo::ssl::cinder_config { - cinder_api_paste_ini { - 'filter:ssl_header_handler/paste.filter_factory': - value => 'oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory'; - 'pipeline:apiversions/pipeline': - value => 'ssl_header_handler faultwrap osvolumeversionapp'; - } -} |