x
/
packstack
Code Issues Proposed changes

Added Swift hash setting 

Adds new option CONFIG_SWIFT_HASH to set swift_hash_suffix
in swift.conf

Change-Id: Iaaadf451c8bc22bb19712ae88edcfda2797d1cbb
Fixes: rhbz#1033364
This commit is contained in:
Ivan Chavero 2013-12-18 16:00:56 -07:00
parent b80c91c93f
commit 5e4816a9c9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/plugins/swift_600.py
View File

@ -98,6 +98,18 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "os-swift-hash",
"USAGE" : "Shared secret for Swift",
"PROMPT" : "Enter hash for Swift shared secret",
"OPTION_LIST" : [],
"VALIDATORS" : [validators.validate_not_empty],
"DEFAULT_VALUE" : uuid.uuid4().hex[:16],
"MASK_INPUT" : True,
"LOOSE_VALIDATION": False,
"CONF_NAME" : "CONFIG_SWIFT_HASH",
"USE_DEFAULT" : True,
"NEED_CONFIRM" : True,
"CONDITION" : False },
]
groupDict = { "GROUP_NAME" : "OSSWIFT",

2
packstack/puppet/templates/swift_common.pp
View File

@ -4,7 +4,7 @@ class { 'ssh::server::install': }
Class['swift'] -> Service <| |>
class { 'swift':
# not sure how I want to deal with this shared secret
swift_hash_suffix => 'swift_shared_secret',
swift_hash_suffix => '%(CONFIG_SWIFT_HASH)s',
package_ensure => latest,
}