Reviewers: mp+182271_code.launchpad.net,

Message:
Please take a look.

Description:
Get the address correctly from the container.

This is kind of messy, but it does work.
This uses an extra environment variable from the upstart
script to identify the type of container.  MAAS then uses
this when trying to work out the hostname of the machine.

We do need a nicer way to get this done.  We also want to
move the environment variables from the upstart script
into the agent config, but this will be a follow up branch.

https://code.launchpad.net/~thumper/juju-core/container-address/+merge/182271

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/13261044/

Affected files:
   A [revision details]
   M container/lxc/lxc.go
   M juju/osenv/vars.go
   M provider/local/export_test.go
   M provider/local/net.go
   M provider/maas/environprovider.go
   M utils/network.go
   M worker/deployer/simple.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: container/lxc/lxc.go
=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go	2013-08-21 05:38:38 +0000
+++ container/lxc/lxc.go	2013-08-27 04:29:03 +0000
@@ -19,6 +19,7 @@
  	"launchpad.net/juju-core/environs/cloudinit"
  	"launchpad.net/juju-core/environs/config"
  	"launchpad.net/juju-core/instance"
+	"launchpad.net/juju-core/juju/osenv"
  	"launchpad.net/juju-core/names"
  	"launchpad.net/juju-core/state"
  	"launchpad.net/juju-core/state/api"
@@ -339,6 +340,7 @@
  	if err := environs.FinishMachineConfig(machineConfig, environConfig,  
constraints.Value{}); err != nil {
  		return nil, err
  	}
+	machineConfig.MachineEnvironment[osenv.JujuContainerType] =  
string(instance.LXC)
  	cloudConfig, err := cloudinit.New(machineConfig)
  	if err != nil {
  		return nil, err


Index: juju/osenv/vars.go
=== modified file 'juju/osenv/vars.go'
--- juju/osenv/vars.go	2013-07-31 05:16:47 +0000
+++ juju/osenv/vars.go	2013-08-01 01:13:46 +0000
@@ -9,6 +9,7 @@
  	JujuRepository        = "JUJU_REPOSITORY"
  	JujuLxcBridge         = "JUJU_LXC_BRIDGE"
  	JujuProviderType      = "JUJU_PROVIDER_TYPE"
+	JujuContainerType     = "JUJU_CONTAINER_TYPE"
  	JujuStorageDir        = "JUJU_STORAGE_DIR"
  	JujuStorageAddr       = "JUJU_STORAGE_ADDR"
  	JujuSharedStorageDir  = "JUJU_SHARED_STORAGE_DIR"


Index: provider/local/export_test.go
=== modified file 'provider/local/export_test.go'
--- provider/local/export_test.go	2013-07-17 05:09:42 +0000
+++ provider/local/export_test.go	2013-08-01 01:13:46 +0000
@@ -6,6 +6,7 @@
  	gc "launchpad.net/gocheck"

  	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/utils"
  )

  var (
@@ -62,6 +63,6 @@
  		return "127.0.0.1", nil
  	}
  	return func() {
-		getAddressForInterface = getAddressForInterfaceImpl
+		getAddressForInterface = utils.GetAddressForInterface
  	}
  }


Index: provider/local/net.go
=== modified file 'provider/local/net.go'
--- provider/local/net.go	2013-07-17 05:09:42 +0000
+++ provider/local/net.go	2013-08-01 01:13:46 +0000
@@ -3,25 +3,9 @@
  package local

  import (
-	"net"
-
  	"launchpad.net/juju-core/utils"
  )

-var getAddressForInterface = getAddressForInterfaceImpl
-
-// getAddressForInterfaceImpl looks for the network interface
-// and returns the IPv4 address from the possible addresses.
-func getAddressForInterfaceImpl(interfaceName string) (string, error) {
-	iface, err := net.InterfaceByName(interfaceName)
-	if err != nil {
-		logger.Errorf("cannot find network interface %q: %v", interfaceName, err)
-		return "", err
-	}
-	addrs, err := iface.Addrs()
-	if err != nil {
-		logger.Errorf("cannot get addresses for network interface %q: %v",  
interfaceName, err)
-		return "", err
-	}
-	return utils.GetIPv4Address(addrs)
-}
+// getAddressForInterface is a variable so we can change the implementation
+// for testing purposes.
+var getAddressForInterface = utils.GetAddressForInterface


Index: utils/network.go
=== modified file 'utils/network.go'
--- utils/network.go	2013-07-08 02:54:38 +0000
+++ utils/network.go	2013-08-01 01:13:46 +0000
@@ -6,8 +6,12 @@
  import (
  	"fmt"
  	"net"
+
+	"launchpad.net/loggo"
  )

+var logger = loggo.GetLogger("juju.utils")
+
  // GetIPv4Address iterates through the addresses expecting the format from
  // func (ifi *net.Interface) Addrs() ([]net.Addr, error)
  func GetIPv4Address(addresses []net.Addr) (string, error) {
@@ -24,3 +28,19 @@
  	}
  	return "", fmt.Errorf("no addresses match")
  }
+
+// GetAddressForInterface looks for the network interface
+// and returns the IPv4 address from the possible addresses.
+func GetAddressForInterface(interfaceName string) (string, error) {
+	iface, err := net.InterfaceByName(interfaceName)
+	if err != nil {
+		logger.Errorf("cannot find network interface %q: %v", interfaceName, err)
+		return "", err
+	}
+	addrs, err := iface.Addrs()
+	if err != nil {
+		logger.Errorf("cannot get addresses for network interface %q: %v",  
interfaceName, err)
+		return "", err
+	}
+	return GetIPv4Address(addrs)
+}


Index: provider/maas/environprovider.go
=== modified file 'provider/maas/environprovider.go'
--- provider/maas/environprovider.go	2013-08-20 18:50:48 +0000
+++ provider/maas/environprovider.go	2013-08-27 04:29:03 +0000
@@ -4,10 +4,15 @@
  package maas

  import (
+	"os"
+
  	"launchpad.net/loggo"

  	"launchpad.net/juju-core/environs"
  	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/instance"
+	"launchpad.net/juju-core/juju/osenv"
+	"launchpad.net/juju-core/utils"
  )

  // Logger for the MAAS provider.
@@ -63,6 +68,10 @@
  }

  func (maasEnvironProvider) hostname() (string, error) {
+	// Hack to get container ip addresses properly for MAAS demo.
+	if os.Getenv(osenv.JujuContainerType) == string(instance.LXC) {
+		return utils.GetAddressForInterface("eth0")
+	}
  	info := machineInfo{}
  	err := info.load()
  	if err != nil {


Index: worker/deployer/simple.go
=== modified file 'worker/deployer/simple.go'
--- worker/deployer/simple.go	2013-08-22 03:39:33 +0000
+++ worker/deployer/simple.go	2013-08-27 04:29:03 +0000
@@ -141,9 +141,10 @@
  		Desc:    "juju unit agent for " + unitName,
  		Cmd:     cmd,
  		Out:     logPath,
-		// Propagate the provider type enviroment variable.
+		// Propagate the provider type and container type enviroment variables.
  		Env: map[string]string{
-			osenv.JujuProviderType: os.Getenv(osenv.JujuProviderType),
+			osenv.JujuProviderType:  os.Getenv(osenv.JujuProviderType),
+			osenv.JujuContainerType: os.Getenv(osenv.JujuContainerType),
  		},
  	}
  	return uconf.Install()