synced latest charmhelpers

hooks/charmhelpers/contrib/openstack/utils.py

@@ -41,6 +41,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
     ('quantal', 'folsom'),
     ('raring', 'grizzly'),
     ('saucy', 'havana'),
+    ('trusty', 'icehouse')
 ])
 
 
@@ -201,7 +202,7 @@ def os_release(package, base='essex'):
 
 
 def import_key(keyid):
-    cmd = "apt-key adv --keyserver keyserver.ubuntu.com " \
+    cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 " \
           "--recv-keys %s" % keyid
     try:
         subprocess.check_call(cmd.split(' '))
@@ -260,6 +261,9 @@ def configure_installation_source(rel):
             'havana': 'precise-updates/havana',
             'havana/updates': 'precise-updates/havana',
             'havana/proposed': 'precise-proposed/havana',
+            'icehouse': 'precise-updates/icehouse',
+            'icehouse/updates': 'precise-updates/icehouse',
+            'icehouse/proposed': 'precise-proposed/icehouse',
         }
 
         try:

hooks/charmhelpers/contrib/storage/linux/utils.py

@@ -22,4 +22,4 @@ def zap_disk(block_device):
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', block_device])
+    check_call(['sgdisk', '--zap-all', '--mbrtogpt', block_device])

hooks/charmhelpers/core/host.py

@@ -279,3 +279,13 @@ def get_nic_mtu(nic):
         if 'mtu' in words:
             mtu = words[words.index("mtu") + 1]
     return mtu
+
+
+def get_nic_hwaddr(nic):
+    cmd = ['ip', '-o', '-0', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd)
+    hwaddr = ""
+    words = ip_output.split()
+    if 'link/ether' in words:
+        hwaddr = words[words.index('link/ether') + 1]
+    return hwaddr

hooks/charmhelpers/fetch/__init__.py

@@ -44,8 +44,16 @@ CLOUD_ARCHIVE_POCKETS = {
     'precise-havana/updates': 'precise-updates/havana',
     'precise-updates/havana': 'precise-updates/havana',
     'havana/proposed': 'precise-proposed/havana',
-    'precies-havana/proposed': 'precise-proposed/havana',
+    'precise-havana/proposed': 'precise-proposed/havana',
     'precise-proposed/havana': 'precise-proposed/havana',
+    # Icehouse
+    'icehouse': 'precise-updates/icehouse',
+    'precise-icehouse': 'precise-updates/icehouse',
+    'precise-icehouse/updates': 'precise-updates/icehouse',
+    'precise-updates/icehouse': 'precise-updates/icehouse',
+    'icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-proposed/icehouse': 'precise-proposed/icehouse',
 }
 
 

revision

@@ -1 +1 @@
-10
+11