diff --git a/contrail_setup_utils/setup.py b/contrail_setup_utils/setup.py index e08d3819..8a9740b6 100755 --- a/contrail_setup_utils/setup.py +++ b/contrail_setup_utils/setup.py @@ -321,6 +321,7 @@ def _parse_args(self, args_str): parser.add_argument("--storage-directory-config", help = "Directories to be sued for distributed storage", nargs="+", type=str) parser.add_argument("--collector-hosts", help = "IP Addresses of collector nodes", nargs='+', type=str) parser.add_argument("--collector-host-tokens", help = "Passwords of collector nodes", nargs='+', type=str) + parser.add_argument("--cfg-host", help = "IP Address of config node") parser.add_argument("--live-migration", help = "Live migration enabled") parser.add_argument("--nfs-live-migration", help = "NFS for Live migration enabled") parser.add_argument("--nfs-livem-subnet", help = "Subnet for NFS for Live migration VM", nargs="+", type=str) @@ -1850,8 +1851,11 @@ def run_services(self): storage_setup_args = storage_setup_args + " --storage-local-ssd-disk-config %s" %(' '.join(self._args.storage_local_ssd_disk_config)) storage_setup_args = storage_setup_args + " --storage-nfs-disk-config %s" %(' '.join(self._args.storage_nfs_disk_config)) storage_setup_args = storage_setup_args + " --storage-directory-config %s" %(' '.join(self._args.storage_directory_config)) - storage_setup_args = storage_setup_args + " --collector-hosts %s" %(' '.join(self._args.collector_hosts)) - storage_setup_args = storage_setup_args + " --collector-host-tokens %s" %(' '.join(self._args.collector_host_tokens)) + if self._args.collector_hosts: + storage_setup_args = storage_setup_args + " --collector-hosts %s" %(' '.join(self._args.collector_hosts)) + storage_setup_args = storage_setup_args + " --collector-host-tokens %s" %(' '.join(self._args.collector_host_tokens)) + if self._args.cfg_host: + storage_setup_args = storage_setup_args + " --cfg-host %s" %(self._args.cfg_host) with settings(host_string=self._args.storage_master): run("python /opt/contrail/contrail_installer/contrail_setup_utils/storage-ceph-setup.py %s" %(storage_setup_args)) diff --git a/contrail_setup_utils/storage-ceph-setup.py b/contrail_setup_utils/storage-ceph-setup.py index 0756cf63..a150ee6a 100755 --- a/contrail_setup_utils/storage-ceph-setup.py +++ b/contrail_setup_utils/storage-ceph-setup.py @@ -889,7 +889,7 @@ def __init__(self, args_str = None): if disksplit[0] == hostname: if disksplit[0] == add_storage_node: run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@%s/cinder' %(self._args.storage_master)) - run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.storage_master)) + run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.cfg_host)) run('sudo cinder-manage db sync') existing_backends=run('sudo cat /etc/cinder/cinder.conf |grep enabled_backends |awk \'{print $3}\'', shell='/bin/bash') if existing_backends != '': @@ -920,7 +920,7 @@ def __init__(self, args_str = None): if disksplit[0] == hostname: if disksplit[0] == add_storage_node: run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@%s/cinder' %(self._args.storage_master)) - run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.storage_master)) + run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.cfg_host)) run('sudo cinder-manage db sync') existing_backends=run('sudo cat /etc/cinder/cinder.conf |grep enabled_backends |awk \'{print $3}\'', shell='/bin/bash') if existing_backends != '': @@ -1512,7 +1512,7 @@ def __init__(self, args_str = None): local('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@127.0.0.1/cinder') #recently contrail changed listen address from 0.0.0.0 to mgmt address so adding mgmt network to rabbit host - local('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.storage_master)) + local('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.cfg_host)) if configure_with_ceph == 1: # Cinder Configuration @@ -1561,7 +1561,7 @@ def __init__(self, args_str = None): if local_disk_list != '': if entries != self._args.storage_master: run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@%s/cinder' %(self._args.storage_master)) - run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.storage_master)) + run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.cfg_host)) run('sudo cinder-manage db sync') existing_backends=run('sudo cat /etc/cinder/cinder.conf |grep enabled_backends |awk \'{print $3}\'', shell='/bin/bash') if existing_backends != '': @@ -1590,7 +1590,7 @@ def __init__(self, args_str = None): if local_ssd_disk_list != '': if entries != self._args.storage_master: run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection mysql://cinder:cinder@%s/cinder' %(self._args.storage_master)) - run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.storage_master)) + run('sudo openstack-config --set /etc/cinder/cinder.conf DEFAULT rabbit_host %s' %(self._args.cfg_host)) run('sudo cinder-manage db sync') existing_backends=run('sudo cat /etc/cinder/cinder.conf |grep enabled_backends |awk \'{print $3}\'', shell='/bin/bash') if existing_backends != '': @@ -1790,6 +1790,7 @@ def _parse_args(self, args_str): parser.add_argument("--storage-directory-config", help = "Directories to be sued for distributed storage", nargs="+", type=str) parser.add_argument("--collector-hosts", help = "IP Addresses of collector nodes", nargs='+', type=str) parser.add_argument("--collector-host-tokens", help = "Passwords of collector nodes", nargs='+', type=str) + parser.add_argument("--cfg-host", help = "IP Address of config node") parser.add_argument("--add-storage-node", help = "Add a new storage node") parser.add_argument("--storage-setup-mode", help = "Storage configuration mode") @@ -1804,4 +1805,4 @@ def main(args_str = None): #end main if __name__ == "__main__": - main() + main() diff --git a/setup-vnc-storage.py b/setup-vnc-storage.py index bedac03a..f8de606d 100755 --- a/setup-vnc-storage.py +++ b/setup-vnc-storage.py @@ -35,8 +35,11 @@ def __init__(self, args_str = None): setup_args_str = setup_args_str + " --storage-nfs-disk-config %s" %(' '.join(self._args.storage_nfs_disk_config)) setup_args_str = setup_args_str + " --storage-journal-config %s" %(' '.join(self._args.storage_journal_config)) setup_args_str = setup_args_str + " --storage-directory-config %s" %(' '.join(self._args.storage_directory_config)) - setup_args_str = setup_args_str + " --collector-hosts %s" %(' '.join(self._args.collector_hosts)) - setup_args_str = setup_args_str + " --collector-host-tokens %s" %(' '.join(self._args.collector_host_tokens)) + if self._args.collector_hosts: + setup_args_str = setup_args_str + " --collector-hosts %s" %(' '.join(self._args.collector_hosts)) + setup_args_str = setup_args_str + " --collector-host-tokens %s" %(' '.join(self._args.collector_host_tokens)) + if self._args.cfg_host: + setup_args_str = setup_args_str + " --cfg-host %s" % (self._args.cfg_host) #Setup storage if storage is defined in testbed.py if self._args.storage_disk_config[0] != 'none' or self._args.storage_directory_config[0] != 'none' or self._args.storage_local_disk_config[0] != 'none' or self._args.storage_nfs_disk_config[0] != 'none' or self._args.storage_local_ssd_disk_config[0] != 'none' or self._args.storage_ssd_disk_config[0] != 'none': @@ -47,7 +50,7 @@ def __init__(self, args_str = None): def _parse_args(self, args_str): ''' - Eg. python setup-vnc-storage.py --storage-master 10.157.43.171 --storage-hostnames cmbu-dt05 cmbu-ixs6-2 --storage-hosts 10.157.43.171 10.157.42.166 --storage-host-tokens n1keenA n1keenA --storage-disk-config 10.157.43.171:sde 10.157.43.171:sdf 10.157.43.171:sdg --storage-directory-config 10.157.42.166:/mnt/osd0 --live-migration enabled --collector-hosts 10.157.43.171 10.157.42.166 --collector-host-tokens n1keenA n1keenA + Eg. python setup-vnc-storage.py --storage-master 10.157.43.171 --storage-hostnames cmbu-dt05 cmbu-ixs6-2 --storage-hosts 10.157.43.171 10.157.42.166 --storage-host-tokens n1keenA n1keenA --storage-disk-config 10.157.43.171:sde 10.157.43.171:sdf 10.157.43.171:sdg --storage-directory-config 10.157.42.166:/mnt/osd0 --live-migration enabled --collector-hosts 10.157.43.171 10.157.42.166 --collector-host-tokens n1keenA n1keenA --cfg-host 10.157.43.171 ''' # Source any specified config/ini file @@ -95,6 +98,7 @@ def _parse_args(self, args_str): parser.add_argument("--live-migration", help = "Live migration enabled") parser.add_argument("--collector-hosts", help = "IP Addresses of collector nodes", nargs='+', type=str) parser.add_argument("--collector-host-tokens", help = "Passwords of collector nodes", nargs='+', type=str) + parser.add_argument("--cfg-host", help = "IP Address of config node") parser.add_argument("--add-storage-node", help = "Add a new storage node to the existing cluster") parser.add_argument("--storage-setup-mode", help = "Configuration mode")