← Back to branch summary

~tribaal/charms/trusty/landscape-server/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/host.py

  • Committer: Free Ekanayaka
  • Date: 2015-01-30 11:16:09 UTC
  • Revision ID: free.ekanayaka@canonical.com-20150130111609-kubupb768v7xltre
Add hahelpers to charmhelpers config [trivial] [r=tealeg]

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/host.py
361
361
        ip_output = (line for line in ip_output if line)
362
362
        for line in ip_output:
363
363
            if line.split()[1].startswith(int_type):
364
 
                matched = re.search('.*: (bond[0-9]+\.[0-9]+)@.*', line)
 
364
                matched = re.search('.*: (' + int_type + r'[0-9]+\.[0-9]+)@.*', line)
365
365
                if matched:
366
366
                    interface = matched.groups()[0]
367
367
                else: