Added Swift hash setting
Adds new option CONFIG_SWIFT_HASH to set swift_hash_suffix in swift.conf Change-Id: Ic1f84f5309e5dce003b8b5e5d78589c1cca3216c Fixes: rhbz#1005727
This commit is contained in:
parent
d3bb52e0a2
commit
debccc84ff
|
@ -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",
|
||||
|
@ -258,4 +270,3 @@ def createcommonmanifest(config):
|
|||
if manifestfile.endswith("_swift.pp"):
|
||||
data = getManifestTemplate("swift_common.pp")
|
||||
appendManifestFile(os.path.split(manifestfile)[1], data)
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ 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,
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue