Skip to content

Commit

Permalink
Merge "Fix to instances backup and restore with vcenter as compute" i…
Browse files Browse the repository at this point in the history 
…nto R3.0
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed May 24, 2016
2 parents d5ea039 + 686b283 commit 4a5efd4
Show file tree
Hide file tree
Showing 2 changed files with 132 additions and 106 deletions.
192 changes: 105 additions & 87 deletions fabfile/tasks/backup_restore.py
View file
Expand Up @@ -6,6 +6,7 @@
from fabfile.utils.fabos import detect_ostype
from fabfile.tasks.services import *
from fabfile.tasks.zookeeper import *
from fabfile.utils.cluster import get_orchestrator
import string
import time
import re
Expand Down Expand Up @@ -388,50 +389,55 @@ def backup_instances(db_datas, store_db='local'):
global backup_path, final_dir
tsn_nodes = []
tor_nodes = []
contrail_vms=[]
orchestrator = get_orchestrator()
msg = "Processing instances backup and default path for backup data is ~/contrail_bkup_data/hostname/instances in ({HOST}) \n"
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
if host not in (tsn_nodes and tor_nodes) :
with settings(host_string=host):
host_name = sudo('hostname')
if store_db == 'local':
print (msg.format(HOST=host_name))
if store_db == 'remote':
msg = "Processing instances data Backup and puting instances backup data into remote host:({HOST}) and default path is ~/contrail_bkup_data/hostname/instances or backup path is defined as per testbed.py file \n"
remote_host = env.roledefs['backup'][0]
print (msg.format(HOST=remote_host))
insta_path = sudo("grep '^state_path' /etc/nova/nova.conf")
instances_path = insta_path.split('=')
instances_path = instances_path[-1]
instances_path = instances_path.strip()
db_path = instances_path
execute(verify_disk_space, db_datas, db_path, store_db)
remote_instances_path = '%s%s/' % (backup_path, host_name)
if db_datas:
remote_instances_path = final_dir + '%s/' % (host_name)
if store_db == 'local':
sudo(
'rsync -az --progress %s/instances %s' %
(instances_path, remote_instances_path))
execute(
backup_info_file,
remote_instances_path,
backup_type='Instances')
if store_db == 'local':
sudo('cp backup_info.txt %s' % remote_instances_path)
if store_db == 'remote':
remote_path = '%s' % (remote_instances_path)
source_path = '%s/instances' % (instances_path)
execute(ssh_key_gen)
remote_cmd='rsync -avz -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress %s %s:%s' %( source_path,remote_host,remote_path)
sudo(remote_cmd)
remote_bk_cmd = 'scp -o "StrictHostKeyChecking no" -r backup_info.txt %s:%s' % (
remote_host,
remote_path)
sudo(remote_bk_cmd)
sudo('rm -rf backup_info.txt')
if orchestrator != 'vcenter':
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
contrail_vms = get_esxi_contrail_vms()

if (host not in tsn_nodes) and (host not in tor_nodes) and (host not in contrail_vms) :
with settings(host_string=host):
host_name = sudo('hostname')
if store_db == 'local':
print (msg.format(HOST=host_name))
if store_db == 'remote':
msg = "Processing instances data Backup and puting instances backup data into remote host:({HOST}) and default path is ~/contrail_bkup_data/hostname/instances or backup path is defined as per testbed.py file \n"
remote_host = env.roledefs['backup'][0]
print (msg.format(HOST=remote_host))
insta_path = sudo("grep '^state_path' /etc/nova/nova.conf")
instances_path = insta_path.split('=')
instances_path = instances_path[-1]
instances_path = instances_path.strip()
db_path = instances_path
execute(verify_disk_space, db_datas, db_path, store_db)
remote_instances_path = '%s%s/' % (backup_path, host_name)
if db_datas:
remote_instances_path = final_dir + '%s/' % (host_name)
if store_db == 'local':
sudo(
'rsync -az --progress %s/instances %s' %
(instances_path, remote_instances_path))
execute(
backup_info_file,
remote_instances_path,
backup_type='Instances')
if store_db == 'local':
sudo('cp backup_info.txt %s' % remote_instances_path)
if store_db == 'remote':
remote_path = '%s' % (remote_instances_path)
source_path = '%s/instances' % (instances_path)
execute(ssh_key_gen)
remote_cmd='rsync -avz -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress %s %s:%s' %( source_path,remote_host,remote_path)
sudo(remote_cmd)
remote_bk_cmd = 'scp -o "StrictHostKeyChecking no" -r backup_info.txt %s:%s' % (
remote_host,
remote_path)
sudo(remote_bk_cmd)
sudo('rm -rf backup_info.txt')
# end backup_instances

def verify_disk_space(db_datas, db_path, store_db):
Expand Down Expand Up @@ -966,60 +972,63 @@ def restore_instances(backup_data_path, store_db='local'):
host = env.host_string
tsn_nodes = []
tor_nodes = []
contrail_vms = []
orchestrator = get_orchestrator()
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
if host not in (tsn_nodes and tor_nodes) :
msg = "Restoring backed-up instances data in ({HOST}).\n"
with settings(host_string=host):
host_name = sudo('hostname')
insta_path = sudo("grep '^state_path' /etc/nova/nova.conf")
instances_path = insta_path.split('=')
instances_path = instances_path[-1]
instances_path = instances_path.strip()
remote_instances_dir_path = '%s%s/' % (backup_path, host_name)
if backup_data_path:
if store_db == 'local':
with settings(host_string=host):
for bk_path in backup_data_path:
snapshot_path = bk_path + '%s/' % (host_name)
if exists('%sinstances/' % snapshot_path):
remote_instances_dir_path = snapshot_path
contrail_vms = get_esxi_contrail_vms()
if orchestrator != 'vcenter' :
if (host not in tsn_nodes) and (host not in tor_nodes) and (host not in contrail_vms) :
msg = "Restoring backed-up instances data in ({HOST}).\n"
with settings(host_string=host):
host_name = sudo('hostname')
insta_path = sudo("grep '^state_path' /etc/nova/nova.conf")
instances_path = insta_path.split('=')
instances_path = instances_path[-1]
instances_path = instances_path.strip()
remote_instances_dir_path = '%s%s/' % (backup_path, host_name)
if backup_data_path:
if store_db == 'local':
with settings(host_string=host):
for bk_path in backup_data_path:
snapshot_path = bk_path + '%s/' % (host_name)
if exists('%sinstances/' % snapshot_path):
remote_instances_dir_path = snapshot_path
if store_db == 'remote':
with settings(host_string=env.roledefs['backup'][0]):
for bk_path in backup_data_path:
snapshot_path = bk_path + '%s/' % (host_name)
if exists('%sinstances/' % snapshot_path):
remote_instances_dir_path = snapshot_path
if store_db == 'remote':
msg = "Restoring instances backed-up data and getting backup data from remote host:({HOST}) \n"
remote_host = env.roledefs['backup'][0]
print (msg.format(HOST=remote_host))
remote_path = '%sinstances' % (remote_instances_dir_path)
with settings(host_string=env.roledefs['backup'][0]):
for bk_path in backup_data_path:
snapshot_path = bk_path + '%s/' % (host_name)
if exists('%sinstances/' % snapshot_path):
remote_instances_dir_path = snapshot_path
if store_db == 'remote':
msg = "Restoring instances backed-up data and getting backup data from remote host:({HOST}) \n"
remote_host = env.roledefs['backup'][0]
print (msg.format(HOST=remote_host))
remote_path = '%sinstances' % (remote_instances_dir_path)
with settings(host_string=env.roledefs['backup'][0]):
if not exists(remote_path):
print "Remote path doesnot exist ... So aborting the restore nova instances data."
execute(start_nova_openstack_compute)
raise SystemExit()
execute(ssh_key_gen)
if not exists(remote_path):
print "Remote path doesnot exist ... So aborting the restore nova instances data."
execute(start_nova_openstack_compute)
raise SystemExit()
execute(ssh_key_gen)
with settings(host_string=host):
remote_cmd='rsync -avz -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress %s:%s %s/' %( remote_host,remote_path,instances_path)
sudo(remote_cmd)
with settings(host_string=host):
remote_cmd='rsync -avz -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" --progress %s:%s %s/' %( remote_host,remote_path,instances_path)
sudo(remote_cmd)
with settings(host_string=host):
if store_db == 'local':
print (msg.format(HOST=host_name))
remote_path = '%sinstances' % (remote_instances_dir_path)
if not exists(remote_path):
print "Remote path doesnot exist ... So aborting the restore nova instaces data ."
execute(start_nova_openstack_compute)
raise SystemExit()
sudo('rsync -az --progress %sinstances %s/ ' %
(remote_instances_dir_path,instances_path ))
if store_db == 'local':
print (msg.format(HOST=host_name))
remote_path = '%sinstances' % (remote_instances_dir_path)
if not exists(remote_path):
print "Remote path doesnot exist ... So aborting the restore nova instaces data ."
execute(start_nova_openstack_compute)
raise SystemExit()
sudo('rsync -az --progress %sinstances %s/ ' %
(remote_instances_dir_path,instances_path ))

# end restore_instances


def ssh_key_gen():
host = env.host_string
with settings(host_string=host):
Expand All @@ -1039,6 +1048,15 @@ def ssh_key_gen():

# end ssh_key_gen

def get_esxi_contrail_vms():
contrail_vms=[]
esxi = getattr(testbed,'esxi_hosts',None)
if esxi:
esxi_hosts = esxi.keys()
for esxi_host in esxi_hosts:
contrail_vms.append(esxi[esxi_host]['contrail_vm']['host'])
return contrail_vms
# end get_esxi_contrail_vms

def replace_key(text, skip_key):
for key in skip_key:
Expand Down
46 changes: 27 additions & 19 deletions fabfile/tasks/services.py
View file
Expand Up @@ -5,7 +5,7 @@
from fabfile.utils.cluster import get_orchestrator
from fabric.contrib.files import exists
from fabfile.utils.host import hstr_to_ip

from backup_restore import get_esxi_contrail_vms
@task
@roles('cfgm')
def stop_rabbitmq():
Expand Down Expand Up @@ -383,33 +383,41 @@ def stop_nova_openstack_compute():
"""Stop the contrail openstack compute service."""
tsn_nodes = []
tor_nodes = []
contrail_vms = []
host = env.host_string
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
if host not in (tsn_nodes and tor_nodes) :
if detect_ostype() in ['ubuntu']:
sudo('service nova-compute stop')
return
sudo('service openstack-nova-compute stop')
orchestrator = get_orchestrator()
if orchestrator != 'vcenter':
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
contrail_vms = get_esxi_contrail_vms()
if (host not in tsn_nodes) and (host not in tor_nodes) and (host not in contrail_vms) :
if detect_ostype() in ['ubuntu']:
sudo('service nova-compute stop')
return
sudo('service openstack-nova-compute stop')


@roles('compute')
def start_nova_openstack_compute():
"""Start the contrail openstack compute service."""
tsn_nodes = []
tor_nodes = []
contrail_vms = []
host = env.host_string
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
if host not in (tsn_nodes and tor_nodes) :
if detect_ostype() in ['ubuntu']:
sudo('service nova-compute start')
return
sudo('service openstack-nova-compute start')
orchestrator = get_orchestrator()
if orchestrator != 'vcenter':
if 'tsn' in env.roledefs:
tsn_nodes = env.roledefs['tsn']
if 'toragent' in env.roledefs:
tor_nodes = env.roledefs['toragent']
contrail_vms = get_esxi_contrail_vms()
if (host not in tsn_nodes) and (host not in tor_nodes) and (host not in contrail_vms) :
if detect_ostype() in ['ubuntu']:
sudo('service nova-compute start')
return
sudo('service openstack-nova-compute start')


@roles('openstack')
Expand Down

0 comments on commit 4a5efd4

Please sign in to comment.