commit bd097b54f9141d360601eaf7da5ebc641369e6dd
author Scott Baker <smbaker@gmail.com> Wed Sep 02 13:24:00 2015 -0700
committer Scott Baker <smbaker@gmail.com> Wed Sep 02 13:24:00 2015 -0700
tree c1baee19ceee5e6c4eabe5a00d9e8e559276ba77
parent e4d531ff3830cd65620ac0e2d003f9686f505499
parent 74256ed0985bdce583cd6baa761a16599002795c

Merge branch 'master' of github.com:open-cloud/xos

xos/cord/models.py

diff --git a/xos/cord/models.py b/xos/cord/models.py
index 8befa17..995ec4f 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -631,7 +631,7 @@
            return None
         try:
            (a,b,c,d) = ip.split('.')
-           wan_mac = "02:42:%2x:%2x:%2x:%2x" % (int(a), int(b), int(c), int(d))
+           wan_mac = "02:42:%02x:%02x:%02x:%02x" % (int(a), int(b), int(c), int(d))
         except:
            wan_mac = "Exception"
         return wan_mac

xos/observers/vcpe/steps/sync_vcpetenant.yaml

diff --git a/xos/observers/vcpe/steps/sync_vcpetenant.yaml b/xos/observers/vcpe/steps/sync_vcpetenant.yaml
index cb8f92b..c83c539 100644
--- a/xos/observers/vcpe/steps/sync_vcpetenant.yaml
+++ b/xos/observers/vcpe/steps/sync_vcpetenant.yaml
@@ -67,7 +67,7 @@
     shell: rm -f /etc/resolv.conf
 
   - name: Install resolv.conf
-    copy src=/opt/xos/observers/vcpe/files/vm-resolv.conf
+    copy: src=/opt/xos/observers/vcpe/files/vm-resolv.conf
       dest=/etc/resolv.conf
 {% endif %}