Merge "Remove qpid support"
This commit is contained in:
@@ -38,7 +38,7 @@ def initConfig(controller):
|
||||
params = [
|
||||
{"CMD_OPTION": "amqp-backend",
|
||||
"PROMPT": "Set the AMQP service backend",
|
||||
"OPTION_LIST": ["qpid", "rabbitmq"],
|
||||
"OPTION_LIST": ["rabbitmq"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
"DEFAULT_VALUE": "rabbitmq",
|
||||
"MASK_INPUT": False,
|
||||
|
||||
@@ -145,7 +145,7 @@ def copy_puppet_modules(config, messages):
|
||||
'heat', 'horizon', 'inifile', 'ironic', 'keystone',
|
||||
'manila', 'memcached', 'mongodb', 'mysql',
|
||||
'neutron', 'nova', 'nssdb', 'openstack',
|
||||
'openstacklib', 'packstack', 'qpid', 'rabbitmq',
|
||||
'openstacklib', 'packstack', 'rabbitmq',
|
||||
'redis', 'remote', 'rsync', 'sahara', 'ssh',
|
||||
'stdlib', 'swift', 'sysctl', 'tempest', 'trove',
|
||||
'vcsrepo', 'vlan', 'vswitch', 'xinetd', ))
|
||||
|
||||
Reference in New Issue
Block a user