mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Bug 9479 - provide option for built in https
small fix on cloud-setup-managment
This commit is contained in:
parent
4dab93761b
commit
c7b3c81485
@ -13,8 +13,8 @@ if __name__ == '__main__':
|
|||||||
parser.add_option("--https", action="store_true", dest="https", help="Enable HTTPs connection of management server")
|
parser.add_option("--https", action="store_true", dest="https", help="Enable HTTPs connection of management server")
|
||||||
(options, args) = parser.parse_args()
|
(options, args) = parser.parse_args()
|
||||||
if options.https:
|
if options.https:
|
||||||
glbEnv.mode = "HttpsServer"
|
glbEnv.svrMode = "HttpsServer"
|
||||||
else:
|
|
||||||
glbEnv.mode = "Server"
|
glbEnv.mode = "Server"
|
||||||
|
|
||||||
print "Starting to configure CloudStack Management Server:"
|
print "Starting to configure CloudStack Management Server:"
|
||||||
|
|||||||
@ -7,6 +7,8 @@ class sysConfigFactory:
|
|||||||
return sysConfigAgentFactory.getAgent(glbEnv)
|
return sysConfigAgentFactory.getAgent(glbEnv)
|
||||||
elif glbEnv.mode == "Server":
|
elif glbEnv.mode == "Server":
|
||||||
return sysConfigServerFactory.getServer(glbEnv)
|
return sysConfigServerFactory.getServer(glbEnv)
|
||||||
|
elif glbEnv.mode == "HttpsServer":
|
||||||
|
return sysConfigServerFactory.getServer(glbEnv)
|
||||||
elif glbEnv.mode == "Db":
|
elif glbEnv.mode == "Db":
|
||||||
return sysConfigDbFactory.getDb(glbEnv)
|
return sysConfigDbFactory.getDb(glbEnv)
|
||||||
else:
|
else:
|
||||||
@ -69,6 +71,9 @@ class sysConfig(object):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
class sysConfigAgent(sysConfig):
|
class sysConfigAgent(sysConfig):
|
||||||
|
def __init__(self, env):
|
||||||
|
super(sysConfigServer, self).__init__(env)
|
||||||
|
|
||||||
def check(self):
|
def check(self):
|
||||||
if self.env.debug:
|
if self.env.debug:
|
||||||
return True
|
return True
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user