aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-15 15:11:38 -0400
committerDan Prince <dprince@redhat.com>2016-08-17 08:25:37 -0400
commit0df577c6f0acc672b53d470e4cfedb1d7d9c53d1 (patch)
treeff4e657b7ee6fa592d12ac13d797cd84a359a289 /puppet/swift-storage.yaml
parent0b2829480a299dcba6d5471a99ed76fb92ca31a6 (diff)
Add tripleo-packages composable service
This creates a new service to help manage the puppet-tripleo class that enables and disables package installation features. NOTE: we can't move the upgrade setting into the new composable service yet due to coupling with the UpgradeDeployment resources. Change-Id: If35cf6a6f023e12ae8ebbc2d9929d244eb3ffa3a
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]}]}