Renamed vnfs to container, finished VNFS and kernel refactoring

overlays/runtime/default/etc/group.ww

@@ -1,2 +1,2 @@
-{{IncludeFromVnfs $.Self.Vnfs "/etc/group"}}
+{{IncludeFrom $.Container "/etc/group"}}
 {{Include "/etc/group"}}

overlays/runtime/default/etc/passwd.ww

@@ -1,3 +1,3 @@
 root::0:0:root:/root:/bin/bash
-{{IncludeFromVnfs $.Self.Vnfs "/etc/passwd"}}
+{{IncludeFrom $.Container "/etc/passwd"}}
 {{Include "/etc/passwd"}}

overlays/system/default/etc/hostname.ww

@@ -1 +1 @@
-{{$.Self.Id}}
+{{$.Id}}

overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.ww

@@ -1,8 +1,8 @@
 DEVICE=eth0
 NAME=eth0
-IPADDR={{$.Self.NetDevs.eth0.Ipaddr}}
-NETMASK={{$.Self.NetDevs.eth0.Netmask}}
-GATEWAY={{$.Self.NetDevs.eth0.Gateway}}
-HWADDR={{$.Self.NetDevs.eth0.Hwaddr}}
+IPADDR={{$.NetDevs.eth0.Ipaddr}}
+NETMASK={{$.NetDevs.eth0.Netmask}}
+GATEWAY={{$.NetDevs.eth0.Gateway}}
+HWADDR={{$.NetDevs.eth0.Hwaddr}}
 BOOTPROTO=static
 ONBOOT=yes

overlays/system/default/etc/sysconfig/network.ww

@@ -1,2 +1,2 @@
 NETWORKING=yes
-HOSTNAME={{$.Self.Id}}
+HOSTNAME={{$.Id}}

overlays/system/default/ipmi.ww

@@ -8,10 +8,10 @@ if [ ! -e /dev/ipmi0 ]; then
     ls -la /dev/ipmi0
 fi
 
-IP="{{$.Self.IpmiIpaddr}}"
-NETMASK="{{$.Self.IpmiNetmask}}"
-USER="{{$.Self.IpmiUserName}}"
-PASS="{{$.Self.IpmiPassword}}"
+IP="{{$.IpmiIpaddr}}"
+NETMASK="{{$.IpmiNetmask}}"
+USER="{{$.IpmiUserName}}"
+PASS="{{$.IpmiPassword}}"
 
 echo IP is $IP
 echo NETMASK is $NETMASK