summaryrefslogtreecommitdiffstats
path: root/puppet/cinder-storage.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-18 09:29:35 +0000
committerGerrit Code Review <review@openstack.org>2016-08-18 09:29:35 +0000
commitf737847c33c4a518fcb9c5909ed077a2e3811b43 (patch)
tree62350a185c38afb35f16a2930380590599fdece4 /puppet/cinder-storage.yaml
parentaca397bcc74bd3e8e7926d4c9e18730e8dfd745a (diff)
parent0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (diff)
Merge "Add tripleo-packages composable service"
Diffstat (limited to 'puppet/cinder-storage.yaml')
-rw-r--r--puppet/cinder-storage.yaml6
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 30609f3d..9bf00761 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -38,10 +38,6 @@ parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
- EnablePackageInstall:
- default: 'false'
- description: Set to true to enable package installation via Puppet
- type: boolean
UpdateIdentifier:
default: ''
type: string
@@ -250,7 +246,6 @@ resources:
template: "NETWORK_uri"
params:
NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
- enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
# Map heat metadata into hiera datafiles
@@ -288,7 +283,6 @@ resources:
mapped_data:
# Cinder
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
- tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}