diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-20 19:33:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-20 19:33:32 +0000 |
| commit | d16712e040d1f2701df44ce1ae0a1ed634889f0d (patch) | |
| tree | 327828eb11346c72187659f82aeda8a9bd054d16 /manifests | |
| parent | d19e36c13fc9530dbbb9878c262de671805fb81f (diff) | |
| parent | 93195f63652fbe79bc7940fc9658df628f37c0ba (diff) | |
Merge "cinder: move glance params into common"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/cinder.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/cinder/api.pp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 6a821f3..6e8fbb2 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -57,6 +57,7 @@ class tripleo::profile::base::cinder ( rabbit_hosts => $rabbit_endpoints, } include ::cinder::config + include ::cinder::glance } if $step >= 5 { diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp index 5ea2058..450a8e6 100644 --- a/manifests/profile/base/cinder/api.pp +++ b/manifests/profile/base/cinder/api.pp @@ -94,7 +94,6 @@ class tripleo::profile::base::cinder::api ( ssl_key => $tls_keyfile, } include ::cinder::ceilometer - include ::cinder::glance } } |