aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-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/swift-storage.yaml
parentaca397bcc74bd3e8e7926d4c9e18730e8dfd745a (diff)
parent0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (diff)
Merge "Add tripleo-packages composable service"
Diffstat (limited to 'puppet/swift-storage.yaml')
-rw-r--r--puppet/swift-storage.yaml6
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index e55199c2..dc28ee76 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -29,10 +29,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
@@ -270,7 +266,6 @@ resources:
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
- tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
@@ -286,7 +281,6 @@ resources:
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
swift_hash_suffix: {get_param: HashSuffix}
- enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}