Big Switch Neutron ML2 plugin integration

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_volume.pp

diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index 2ef0884..d1f6d6a 100644 (file)
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -13,16 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if str2bool(hiera('disable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('disable_package_install option not supported.')
-    }
-  }
-}
+include tripleo::packages
 
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
@@ -31,6 +22,7 @@ if count(hiera('ntp::servers')) > 0 {
 }
 
 include ::cinder
+include ::cinder::config
 include ::cinder::glance
 include ::cinder::volume
 include ::cinder::setup_test_volume