View | Details | Raw Unified | Return to bug 50937
Collapse All | Expand All

(-)a/management/python-notifier/python-notifier (-1 / +1 lines)
Line 1    Link Here 
1 
Subproject commit 5795ab564093bd83bcee204cbf8c6c36044d8cea
 1 
Subproject commit 054b7e686501e219b0ff44244be931c1c0ae6b8e
(-)a/management/univention-appcenter/python/appcenter/utils.py (+10 lines)
 Lines 94-99   def docker_bridge_network_conflict(): Link Here 
94 
	return False
 94 
	return False
95 

          95
          

        

        

          96
          

          96
          

        

            

              
              
              97
              
def docker_compose_network_conflict():

            

            

              98
              
	docker_compose_net = ipaddr.IPv4Network(ucr_get('appcenter/docker/compose/network', '172.16.1.1/16'))

            

            

              99
              
	for name, iface in interfaces.Interfaces().ipv4_interfaces:

            

            

              100
              
		if 'network' in iface and 'netmask' in iface:

            

            

              101
              
			my_net = ipaddr.IPv4Network('%s/%s' % (iface['network'], iface['netmask']))

            

            

              102
              
			if my_net.overlaps(docker_compose_net):

            

            

              103
              
				return True

            

            

              104
              
	return False

            

            

              105
              

            

            

              106
              

            

        

          97
          
def app_is_running(app):

          107
          
def app_is_running(app):

        

        

          98
          
	from univention.appcenter.app_cache import Apps

          108
          
	from univention.appcenter.app_cache import Apps

        

        

          99
          
	if isinstance(app, basestring):

          109
          
	if isinstance(app, basestring):

        



(-)a/management/univention-appcenter/umc/python/appcenter/__init__.py
      (-1 / +6 lines)




  

    

    

       Lines 63-69
      from univention.appcenter.exceptions import Abort, NetworkError, AppCenterError 
    
  Link Here 
    

  

        

          63
          
from univention.appcenter.packages import reload_package_manager, get_package_manager, package_lock, LOCK_FILE

          63
          
from univention.appcenter.packages import reload_package_manager, get_package_manager, package_lock, LOCK_FILE

        

        

          64
          
from univention.appcenter.app_cache import Apps, AppCenterCache, default_server

          64
          
from univention.appcenter.app_cache import Apps, AppCenterCache, default_server

        

        

          65
          
from univention.appcenter.udm import _update_modules

          65
          
from univention.appcenter.udm import _update_modules

        

          
            

              66
              
from univention.appcenter.utils import docker_is_running, call_process, docker_bridge_network_conflict, send_information, app_is_running, find_hosts_for_master_packages, get_local_fqdn


              66
              
from univention.appcenter.utils import docker_is_running, call_process, docker_bridge_network_conflict, docker_compose_network_conflict, send_information, app_is_running, find_hosts_for_master_packages, get_local_fqdn

            

        

          67
          
from univention.appcenter.log import get_base_logger, log_to_logfile

          67
          
from univention.appcenter.log import get_base_logger, log_to_logfile

        

        

          68
          
from univention.appcenter.ucr import ucr_instance, ucr_save

          68
          
from univention.appcenter.ucr import ucr_instance, ucr_save

        

        

          69
          
from univention.appcenter.settings import FileSetting, PasswordFileSetting

          69
          
from univention.appcenter.settings import FileSetting, PasswordFileSetting

        

  

    

    

       Lines 274-279
      class Instance(umcm.Base, ProgressMixin): 
    
  Link Here 
    

  

        

          274
          
			msg += _('Please either configure a different network for the docker bridge by setting the UCR variable docker/daemon/default/opts/bip to a different network and restart the system,') + ' '

          274
          
			msg += _('Please either configure a different network for the docker bridge by setting the UCR variable docker/daemon/default/opts/bip to a different network and restart the system,') + ' '

        

        

          275
          
			msg += _('or disable the docker support in the AppCenter by setting appcenter/docker to false.')

          275
          
			msg += _('or disable the docker support in the AppCenter by setting appcenter/docker to false.')

        

        

          276
          
			raise umcm.UMC_Error(msg)

          276
          
			raise umcm.UMC_Error(msg)

        

            

              
              
              277
              
		if docker_compose_network_conflict():

            

            

              278
              
			msg = _('A conflict between the system network settings and the docker compose default network has been detected.') + '\n\n'

            

            

              279
              
			msg += _('Please either configure a different network for docker compose by setting the UCR variable appcenter/docker/compose/network to a different network and restart the system,') + ' '

            

            

              280
              
			msg += _('or disable the docker support in the AppCenter by setting appcenter/docker to false.')

            

            

              281
              
			raise umcm.UMC_Error(msg)

            

        

          277
          
		if not docker_is_running():

          282
          
		if not docker_is_running():

        

        

          278
          
			MODULE.warn('Docker is not running! Trying to start it now...')

          283
          
			MODULE.warn('Docker is not running! Trying to start it now...')

        

        

          279
          
			call_process(['invoke-rc.d', 'docker', 'start'])

          284
          
			call_process(['invoke-rc.d', 'docker', 'start'])

        



(-)a/test/ucs-ec2-tools
      (-1 / +1 lines)




  

    

    

      Line 1
       
    
  Link Here 
    

  

          
            

              1
              
Subproject commit 94ea10eef74da3c33258201809030f9fcd7d7a6d


              1
              
Subproject commit fc9f512f23cef2d0b39aef0666f3588c21489a9d

            






  

  Return to bug 50937