Fixes for containerized deployments

Don't have a mysql container when pacemaker used. Fallback to the host mysql
client for now.
virsh is run on the compute node, so need to run via root on the nova_compute
container.
This commit is contained in:
Ollie Walsh 2017-10-05 15:01:45 +00:00 committed by Joe H. Rahme
parent 0a0e8ec89a
commit fc64781825

View File

@ -76,7 +76,7 @@ class VirshXMLClient(SSHClient):
def dumpxml(self, domain):
if CONF.compute_private_config.containers:
ctx = self.container_command('nova_api')
ctx = self.container_command('nova_compute', user='root')
else:
ctx = self.sudo_command()
with ctx:
@ -115,12 +115,7 @@ class MySQLClient(SSHClient):
self.database_host,
command,
self.database)
if CONF.compute_private_config.containers:
ctx = self.container_command('mysql')
else:
ctx = self.prefix_command()
with ctx:
return self.execute(self.host, sql_cmd)
return self.execute(self.host, sql_cmd)
class NovaManageClient(SSHClient):