Merge into trunk : lp1234127-add-cloud-tools-pocket : Code : juju-core

Status:

Merged

Approved by:

Dimiter Naydenov on 2013-10-03

Approved revision:

no longer in the source branch.

Merged at revision:

1948

Proposed branch:

lp:~axwalk/juju-core/lp1234127-add-cloud-tools-pocket

Merge into:

lp:~go-bot/juju-core/trunk

Diff against target:

96 lines (+35/-6)

2 files modified

environs/cloudinit/cloudinit.go (+26/-2)
environs/cloudinit/cloudinit_test.go (+9/-4)

To merge this branch:

bzr merge lp:~axwalk/juju-core/lp1234127-add-cloud-tools-pocket

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Dimiter Naydenov (community)		2013-10-03	Approve on 2013-10-03
Review via email: mp+189023@code.launchpad.net

Commit message

environs/cloudinit: use cloud-tools on precise

Use the cloud-tools pocket of the cloud archive on
12.04 (presumably we'll update for later LTS'). Also,
remove the PPA for precise, as cloud-tools has a recent
enough version of mongodb-server for our needs.

I've added cloud-tools to apt not just for state
servers, but so it's picked up by all; thus we'll get
up-to-date LXC for when we support containers on
non-local providers.

The OpenStack pockets are not added, as there are
separate ones for separate releases. It'll have to
be up to the charms to add that, I think.

Fixes #1234127

https://codereview.appspot.com/14329043/

Description of the change

environs/cloudinit: use cloud-tools on precise

Use the cloud-tools pocket of the cloud archive on
12.04 (presumably we'll update for later LTS'). Also,
remove the PPA for precise, as cloud-tools has a recent
enough version of mongodb-server for our needs.

I've added cloud-tools to apt not just for state
servers, but so it's picked up by all; thus we'll get
up-to-date LXC for when we support containers on
non-local providers.

The OpenStack pockets are not added, as there are
separate ones for separate releases. It'll have to
be up to the charms to add that, I think.

Fixes #1234127

https://codereview.appspot.com/14329043/

Revision history for this message

Andrew Wilkins (axwalk) wrote on 2013-10-03:

#

Download full text (4.9 KiB)

Reviewers: mp+189023_code.launchpad.net,

Message:
Please take a look.

Description:
environs/cloudinit: use cloud-tools on precise

Use the cloud-tools pocket of the cloud archive on
12.04 (presumably we'll update for later LTS'). Also,
remove the PPA for precise, as cloud-tools has a recent
enough version of mongodb-server for our needs.

I've added cloud-tools to apt not just for state
servers, but so it's picked up by all; thus we'll get
up-to-date LXC for when we support containers on
non-local providers.

The OpenStack pockets are not added, as there are
separate ones for separate releases. It'll have to
be up to the charms to add that, I think.

Fixes #1234127

https://code.launchpad.net/~axwalk/juju-core/lp1234127-add-cloud-tools-pocket/+merge/189023

(do not edit description out of merge proposal)

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

Affected files (+37, -6 lines):
   A [revision details]
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.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: tarmac-20131003034818-qhcpzxqc7ianxg2n
+New revision: <email address hidden>

Index: environs/cloudinit/cloudinit.go
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go 2013-10-02 09:52:01 +0000
+++ environs/cloudinit/cloudinit.go 2013-10-03 09:45:30 +0000
@@ -191,12 +191,18 @@
return nil, err
}

+ // Add the cloud archive cloud-tools pocket to apt sources
+ // for series that need it. This gives us up-to-date LXC,
+ // MongoDB, and other infrastructure.
+ cfg.MaybeAddCloudArchiveCloudTools(c)
+
   if cfg.StateServer {
    // disable the default mongodb installed by the mongodb-server package.
    c.AddBootCmd(`echo ENABLE_MONGODB="no" > /etc/default/mongodb`)

    if cfg.NeedMongoPPA() {
- c.AddAptSource("ppa:juju/stable", "1024R/C8068B11")
+ const key = "" // key is loaded from PPA
+ c.AddAptSource("ppa:juju/stable", key)
    }
    c.AddPackage("mongodb-server")
    certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)
@@ -377,11 +383,29 @@
   return hosts
  }

+// MaybeAddCloudArchiveCloudTools adds the cloud-archive cloud-tools
+// pocket to apt sources, if the series requires it.
+func (cfg *MachineConfig) MaybeAddCloudArchiveCloudTools(c
*cloudinit.Config) {
+ series := cfg.Tools.Version.Series
+ if series != "precise" {
+ // Currently only precise; presumably we'll
+ // need to add each LTS in here as they're
+ // added to the cloud archive.
+ return
+ }
+ const url = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
+ const keyid = "EC4926EA"
+ const keyserver = "" // use default
+ name := fmt.Sprintf("deb %s %s-updates/cloud-tools main", url, series)
+ c.AddAptSourceWithKeyId(name, keyid, keyserver)
+}
+
  func (cfg *MachineConfig) NeedMongoPPA() bool {
   series := cfg.Tools.Version.Series
   // 11.10 and earlier are not supported.
+ // 12.04 can get a compatible version from the cloud-archive.
   // 13.04 and later ship a compatible vers...

Reviewers: mp+189023_code.launchpad.net,

Message:
Please take a look.

Description:
environs/cloudinit: use cloud-tools on precise

Use the cloud-tools pocket of the cloud archive on
12.04 (presumably we'll update for later LTS'). Also,
remove the PPA for precise, as cloud-tools has a recent
enough version of mongodb-server for our needs.

I've added cloud-tools to apt not just for state
servers, but so it's picked up by all; thus we'll get
up-to-date LXC for when we support containers on
non-local providers.

The OpenStack pockets are not added, as there are
separate ones for separate releases. It'll have to
be up to the charms to add that, I think.

Fixes #1234127

https://code.launchpad.net/~axwalk/juju-core/lp1234127-add-cloud-tools-pocket/+merge/189023

(do not edit description out of merge proposal)

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

Affected files (+37, -6 lines):
   A [revision details]
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.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: tarmac-20131003034818-qhcpzxqc7ianxg2n
+New revision: andrew.wilkins@canonical.com-20131003094530-3bwv2fgd4qr7i3jj

Index: environs/cloudinit/cloudinit.go
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-10-02 09:52:01 +0000
+++ environs/cloudinit/cloudinit.go	2013-10-03 09:45:30 +0000
@@ -191,12 +191,18 @@
  		return nil, err
  	}

+	// Add the cloud archive cloud-tools pocket to apt sources
+	// for series that need it. This gives us up-to-date LXC,
+	// MongoDB, and other infrastructure.
+	cfg.MaybeAddCloudArchiveCloudTools(c)
+
  	if cfg.StateServer {
  		// disable the default mongodb installed by the mongodb-server package.
  		c.AddBootCmd(`echo ENABLE_MONGODB="no" > /etc/default/mongodb`)

if cfg.NeedMongoPPA() {
-			c.AddAptSource("ppa:juju/stable", "1024R/C8068B11")
+			const key = "" // key is loaded from PPA
+			c.AddAptSource("ppa:juju/stable", key)
  		}
  		c.AddPackage("mongodb-server")
  		certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)
@@ -377,11 +383,29 @@
  	return hosts
  }

+// MaybeAddCloudArchiveCloudTools adds the cloud-archive cloud-tools
+// pocket to apt sources, if the series requires it.
+func (cfg *MachineConfig) MaybeAddCloudArchiveCloudTools(c  
*cloudinit.Config) {
+	series := cfg.Tools.Version.Series
+	if series != "precise" {
+		// Currently only precise; presumably we'll
+		// need to add each LTS in here as they're
+		// added to the cloud archive.
+		return
+	}
+	const url = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
+	const keyid = "EC4926EA"
+	const keyserver = "" // use default
+	name := fmt.Sprintf("deb %s %s-updates/cloud-tools main", url, series)
+	c.AddAptSourceWithKeyId(name, keyid, keyserver)
+}
+
  func (cfg *MachineConfig) NeedMongoPPA() bool {
  	series := cfg.Tools.Version.Series
  	// 11.10 and earlier are not supported.
+	// 12.04 can get a compatible version from the cloud-archive.
  	// 13.04 and later ship a compatible version in the archive.
-	return series == "precise" || series == "quantal"
+	return series == "quantal"
  }

func shquote(p string) string {

Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-10-02 09:52:01 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-10-03 09:45:30 +0000
@@ -448,12 +448,17 @@
  		checkPackage(c, x, "lxc", hasLxc)
  		if test.cfg.StateServer {
  			checkPackage(c, x, "mongodb-server", true)
-			source := struct{ source, key string }{
+			source := struct{ source, keyid string }{
  				source: "ppa:juju/stable",
-				key:    "1024R/C8068B11",
  			}
  			checkAptSource(c, x, source, test.cfg.NeedMongoPPA())
  		}
+		source := struct{ source, keyid string }{
+			source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu  
precise-updates/cloud-tools main",
+			keyid:  "EC4926EA",
+		}
+		needCloudArchive := test.cfg.Tools.Version.Series == "precise"
+		checkAptSource(c, x, source, needCloudArchive)
  	}
  }

@@ -551,7 +556,7 @@

// CheckAptSources checks that the cloudinit will or won't install the  
given
  // source, depending on the value of match.
-func checkAptSource(c *gc.C, x map[interface{}]interface{}, source struct{  
source, key string }, match bool) {
+func checkAptSource(c *gc.C, x map[interface{}]interface{}, source struct{  
source, keyid string }, match bool) {
  	sources0 := x["apt_sources"]
  	if sources0 == nil {
  		if match {
@@ -565,7 +570,7 @@
  	found := false
  	for _, s0 := range sources {
  		s := s0.(map[interface{}]interface{})
-		if s["source"] == source.source && s["key"] == source.key {
+		if s["source"] == source.source && (source.keyid == "" || s["keyid"] ==  
source.keyid) {
  			found = true
  		}
  	}

Revision history for this message

Dimiter Naydenov (dimitern) wrote on 2013-10-03:

#

Since axw is away at this time, and we need this fix for 1.15.1, I'll
LGTM it and land it now.

https://codereview.appspot.com/14329043/

Revision history for this message

Dimiter Naydenov (dimitern) on 2013-10-03:

#

review: Approve

Revision history for this message

Go Bot (go-bot) wrote on 2013-10-03:

#

Download full text (16.2 KiB)

The attempt to merge lp:~axwalk/juju-core/lp1234127-add-cloud-tools-pocket into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.306s
ok launchpad.net/juju-core/agent/tools 0.268s
ok launchpad.net/juju-core/bzr 7.343s
ok launchpad.net/juju-core/cert 2.652s
ok launchpad.net/juju-core/charm 0.564s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.026s
ok launchpad.net/juju-core/cmd 0.220s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 176.246s
ok launchpad.net/juju-core/cmd/jujud 47.294s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 1.709s
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container/lxc 0.315s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.262s
ok launchpad.net/juju-core/environs 2.925s
ok launchpad.net/juju-core/environs/bootstrap 4.957s
ok launchpad.net/juju-core/environs/cloudinit 0.452s
ok launchpad.net/juju-core/environs/config 0.702s
ok launchpad.net/juju-core/environs/configstore 0.040s
ok launchpad.net/juju-core/environs/filestorage 0.033s
ok launchpad.net/juju-core/environs/httpstorage 0.886s
ok launchpad.net/juju-core/environs/imagemetadata 0.454s
ok launchpad.net/juju-core/environs/instances 0.051s
ok launchpad.net/juju-core/environs/jujutest 0.240s
ok launchpad.net/juju-core/environs/manual 4.104s
ok launchpad.net/juju-core/environs/simplestreams 0.347s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.128s
ok launchpad.net/juju-core/environs/storage 1.372s
ok launchpad.net/juju-core/environs/sync 29.266s
ok launchpad.net/juju-core/environs/testing 0.197s
ok launchpad.net/juju-core/environs/tools 6.833s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 17.047s
ok launchpad.net/juju-core/juju/osenv 0.019s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.016s
ok launchpad.net/juju-core/log/syslog 0.022s
ok launchpad.net/juju-core/names 0.022s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.721s
ok launchpad.net/juju-core/provider/common 0.279s
ok launchpad.net/juju-core/provider/dummy 21.352s
ok launchpad.net/juju-core/provider/ec2 5.358s
ok launchpad.net/juju-core/provider/ec2/httpstorage 0.185s
ok launchpad.net/juju-core/provider/local 2.255s
ok launchpad.net/juju-core/provider/maas 3.701s
ok launchpad.net/juju-core/provider/null 1.152s
ok launchpad.net/juju-core/provider/openstack 13.454s
ok launchpad.net/juju-core/rpc 0.079s
ok launchpad.net/juju-core/rpc/jsoncodec 0.029s
? launchpad.net/juju-core/rpc/rpcreflect [no test f...

The attempt to merge lp:~axwalk/juju-core/lp1234127-add-cloud-tools-pocket into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core/agent	0.306s
ok  	launchpad.net/juju-core/agent/tools	0.268s
ok  	launchpad.net/juju-core/bzr	7.343s
ok  	launchpad.net/juju-core/cert	2.652s
ok  	launchpad.net/juju-core/charm	0.564s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.026s
ok  	launchpad.net/juju-core/cmd	0.220s
?   	launchpad.net/juju-core/cmd/charmd	[no test files]
?   	launchpad.net/juju-core/cmd/charmload	[no test files]
ok  	launchpad.net/juju-core/cmd/juju	176.246s
ok  	launchpad.net/juju-core/cmd/jujud	47.294s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	1.709s
ok  	launchpad.net/juju-core/constraints	0.028s
ok  	launchpad.net/juju-core/container/lxc	0.315s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
ok  	launchpad.net/juju-core/downloader	5.262s
ok  	launchpad.net/juju-core/environs	2.925s
ok  	launchpad.net/juju-core/environs/bootstrap	4.957s
ok  	launchpad.net/juju-core/environs/cloudinit	0.452s
ok  	launchpad.net/juju-core/environs/config	0.702s
ok  	launchpad.net/juju-core/environs/configstore	0.040s
ok  	launchpad.net/juju-core/environs/filestorage	0.033s
ok  	launchpad.net/juju-core/environs/httpstorage	0.886s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.454s
ok  	launchpad.net/juju-core/environs/instances	0.051s
ok  	launchpad.net/juju-core/environs/jujutest	0.240s
ok  	launchpad.net/juju-core/environs/manual	4.104s
ok  	launchpad.net/juju-core/environs/simplestreams	0.347s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	1.128s
ok  	launchpad.net/juju-core/environs/storage	1.372s
ok  	launchpad.net/juju-core/environs/sync	29.266s
ok  	launchpad.net/juju-core/environs/testing	0.197s
ok  	launchpad.net/juju-core/environs/tools	6.833s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/errors	0.016s
ok  	launchpad.net/juju-core/instance	0.023s
?   	launchpad.net/juju-core/instance/testing	[no test files]
ok  	launchpad.net/juju-core/juju	17.047s
ok  	launchpad.net/juju-core/juju/osenv	0.019s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.016s
ok  	launchpad.net/juju-core/log/syslog	0.022s
ok  	launchpad.net/juju-core/names	0.022s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	6.721s
ok  	launchpad.net/juju-core/provider/common	0.279s
ok  	launchpad.net/juju-core/provider/dummy	21.352s
ok  	launchpad.net/juju-core/provider/ec2	5.358s
ok  	launchpad.net/juju-core/provider/ec2/httpstorage	0.185s
ok  	launchpad.net/juju-core/provider/local	2.255s
ok  	launchpad.net/juju-core/provider/maas	3.701s
ok  	launchpad.net/juju-core/provider/null	1.152s
ok  	launchpad.net/juju-core/provider/openstack	13.454s
ok  	launchpad.net/juju-core/rpc	0.079s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.029s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.020s
ok  	launchpad.net/juju-core/state	68.712s
ok  	launchpad.net/juju-core/state/api	1.436s
ok  	launchpad.net/juju-core/state/api/agent	2.069s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	6.241s
ok  	launchpad.net/juju-core/state/api/logger	2.433s
ok  	launchpad.net/juju-core/state/api/machiner	3.210s
ok  	launchpad.net/juju-core/state/api/params	0.030s
ok  	launchpad.net/juju-core/state/api/provisioner	8.780s
ok  	launchpad.net/juju-core/state/api/uniter	26.347s
ok  	launchpad.net/juju-core/state/api/upgrader	3.984s
ok  	launchpad.net/juju-core/state/api/watcher	3.383s
ok  	launchpad.net/juju-core/state/apiserver	4.006s
ok  	launchpad.net/juju-core/state/apiserver/agent	2.875s
ok  	launchpad.net/juju-core/state/apiserver/client	21.708s
ok  	launchpad.net/juju-core/state/apiserver/common	2.795s
ok  	launchpad.net/juju-core/state/apiserver/deployer	4.833s
ok  	launchpad.net/juju-core/state/apiserver/logger	3.998s
ok  	launchpad.net/juju-core/state/apiserver/machine	4.289s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	10.183s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	19.208s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	6.215s
ok  	launchpad.net/juju-core/state/multiwatcher	0.789s
ok  	launchpad.net/juju-core/state/presence	6.538s
ok  	launchpad.net/juju-core/state/statecmd	6.999s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	5.592s
ok  	launchpad.net/juju-core/store	18.117s
ok  	launchpad.net/juju-core/testing	1.407s
ok  	launchpad.net/juju-core/testing/checkers	0.019s
ok  	launchpad.net/juju-core/testing/testbase	0.019s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.140s
ok  	launchpad.net/juju-core/tools	0.019s
ok  	launchpad.net/juju-core/upstart	1.273s
ok  	launchpad.net/juju-core/utils	1.069s
ok  	launchpad.net/juju-core/utils/fslock	1.123s
ok  	launchpad.net/juju-core/utils/parallel	0.422s
ok  	launchpad.net/juju-core/utils/set	0.019s
ok  	launchpad.net/juju-core/version	0.062s
ok  	launchpad.net/juju-core/worker	6.757s
ok  	launchpad.net/juju-core/worker/addressupdater	1.487s
ok  	launchpad.net/juju-core/worker/cleaner	1.373s
ok  	launchpad.net/juju-core/worker/deployer	8.579s
ok  	launchpad.net/juju-core/worker/firewaller	12.220s
ok  	launchpad.net/juju-core/worker/localstorage	0.053s
ok  	launchpad.net/juju-core/worker/logger	1.605s
ok  	launchpad.net/juju-core/worker/machiner	7.651s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.483s
ok  	launchpad.net/juju-core/worker/provisioner	19.192s
ok  	launchpad.net/juju-core/worker/resumer	1.677s

----------------------------------------------------------------------
FAIL: filter_test.go:97: FilterSuite.TestUnitRemoval

[LOG] 41.97177 DEBUG juju.environs.configstore Making /tmp/gocheck-5577006791947779410/7/home/ubuntu/.juju/environments
[LOG] 42.07616 INFO juju environs/testing: uploading FAKE tools 1.15.1-precise-amd64
[LOG] 42.08388 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 42.08389 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 42.08396 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 42.08399 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 42.08403 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 42.08406 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.json": invalid URL "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.json" not found
[LOG] 42.08425 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 42.08434 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 42.08438 INFO juju.environs.boostrap bootstrapping environment "dummyenv"
[LOG] 42.08441 INFO juju.environs.tools reading tools with major.minor version 1.15
[LOG] 42.08442 INFO juju.environs.tools filtering tools by version: 1.15.1
[LOG] 42.08443 INFO juju.environs.tools filtering tools by series: precise
[LOG] 42.08446 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 42.08450 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 42.08452 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 42.08474 DEBUG juju.environs.simplestreams no mirror information available for {DataType:content-download MirrorContentId:com.ubuntu.juju:released:tools FilterFunc:0x691940 ValueTemplate:{Release: Version: Arch: Size:0 Path: FullPath: FileType: SHA256:}}: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 42.08476 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:46131/dummyenv/private/tools/streams/v1/index.json"
[LOG] 42.08481 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:arm"] are [{Thu, 03 Oct 2013 16:26:03 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 42.08483 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 42.08505 INFO juju.provider.dummy would pick tools from 1.15.1-precise-amd64
[LOG] 42.12453 INFO juju.state opening state; mongo addresses: ["localhost:56252"]; entity ""
[LOG] 42.12725 INFO juju.state connection established
[LOG] 42.16042 INFO juju.state initializing environment
[LOG] 42.18225 INFO juju state/api: listening on "127.0.0.1:33097"
[LOG] 42.20124 INFO juju.state opening state; mongo addresses: ["localhost:56252"]; entity ""
[LOG] 42.20491 INFO juju.state connection established
[LOG] 42.21994 INFO juju juju: authorization error while connecting to state server; retrying
[LOG] 42.22003 INFO juju.state opening state; mongo addresses: ["localhost:56252"]; entity ""
[LOG] 42.22606 INFO juju.state connection established
[LOG] 42.29399 INFO juju state/api: dialing "wss://127.0.0.1:33097/"
[LOG] 42.31473 INFO juju state/api: connection established
[LOG] 42.31580 DEBUG juju.rpc.jsoncodec <- {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 42.31676 DEBUG juju.rpc.jsoncodec -> {"RequestId":1,"Response":{}}
[LOG] 42.32733 DEBUG juju.rpc.jsoncodec <- {"RequestId":2,"Type":"Pinger","Request":"Ping","Params":{}}
[LOG] 42.32740 DEBUG juju.rpc.jsoncodec -> {"RequestId":2,"Response":{}}
[LOG] 42.33061 INFO juju writing charm to storage [853 bytes]
[LOG] 42.33066 INFO juju adding charm to state
[LOG] 42.39437 INFO juju state/api: dialing "wss://127.0.0.1:33097/"
[LOG] 42.39737 INFO juju state/api: connection established
[LOG] 42.39748 DEBUG juju.rpc.jsoncodec <- {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"unit-wordpress-0","Password":"password","Nonce":""}}
[LOG] 42.41648 DEBUG juju.rpc.jsoncodec -> {"RequestId":1,"Response":{}}
[LOG] 42.41742 DEBUG juju.rpc.jsoncodec <- {"RequestId":2,"Type":"Pinger","Request":"Ping","Params":{}}
[LOG] 42.41757 DEBUG juju.rpc.jsoncodec <- {"RequestId":3,"Type":"Uniter","Request":"Life","Params":{"Entities":[{"Tag":"unit-wordpress-0"}]}}
[LOG] 42.41772 DEBUG juju.rpc.jsoncodec -> {"RequestId":2,"Response":{}}
[LOG] 42.43382 DEBUG juju.rpc.jsoncodec -> {"RequestId":3,"Response":{"Results":[{"Life":"alive","Error":null}]}}
[LOG] 42.43420 DEBUG juju.rpc.jsoncodec <- {"RequestId":4,"Type":"Uniter","Request":"Life","Params":{"Entities":[{"Tag":"unit-wordpress-0"}]}}
[LOG] 42.43490 DEBUG juju.rpc.jsoncodec -> {"RequestId":4,"Response":{"Results":[{"Life":"alive","Error":null}]}}
[LOG] 42.43508 DEBUG juju.rpc.jsoncodec <- {"RequestId":5,"Type":"Uniter","Request":"Resolved","Params":{"Entities":[{"Tag":"unit-wordpress-0"}]}}
[LOG] 42.43602 DEBUG juju.rpc.jsoncodec -> {"RequestId":5,"Response":{"Results":[{"Error":null,"Mode":""}]}}
[LOG] 42.43620 DEBUG juju.rpc.jsoncodec <- {"RequestId":6,"Type":"Uniter","Request":"Life","Params":{"Entities":[{"Tag":"service-wordpress"}]}}
[LOG] 42.43678 DEBUG juju.rpc.jsoncodec -> {"RequestId":6,"Response":{"Results":[{"Life":"alive","Error":null}]}}
[LOG] 42.43694 DEBUG juju.rpc.jsoncodec <- {"RequestId":7,"Type":"Uniter","Request":"Life","Params":{"Entities":[{"Tag":"service-wordpress"}]}}
[LOG] 42.43836 DEBUG juju.rpc.jsoncodec -> {"RequestId":7,"Response":{"Results":[{"Life":"alive","Error":null}]}}
[LOG] 42.43852 DEBUG juju.rpc.jsoncodec <- {"RequestId":8,"Type":"Uniter","Request":"CharmURL","Params":{"Entities":[{"Tag":"service-wordpress"}]}}
[LOG] 42.43901 DEBUG juju.rpc.jsoncodec -> {"RequestId":8,"Response":{"Results":[{"Error":null,"Result":"local:quantal/wordpress-3","Ok":false}]}}
[LOG] 42.43920 DEBUG juju.worker.uniter.filter charm check skipped, not yet installed.
[LOG] 42.43932 DEBUG juju.rpc.jsoncodec <- {"RequestId":9,"Type":"Uniter","Request":"Watch","Params":{"Entities":[{"Tag":"unit-wordpress-0"}]}}
[LOG] 42.44222 DEBUG juju.rpc.jsoncodec -> {"RequestId":9,"Response":{"Results":[{"NotifyWatcherId":"2","Error":null}]}}
[LOG] 42.44385 DEBUG juju.rpc.jsoncodec <- {"RequestId":10,"Type":"Uniter","Request":"Watch","Params":{"Entities":[{"Tag":"service-wordpress"}]}}
[LOG] 42.44404 DEBUG juju.rpc.jsoncodec <- {"RequestId":11,"Type":"NotifyWatcher","Id":"2","Request":"Next","Params":{}}
[LOG] 42.45750 DEBUG juju.rpc.jsoncodec -> {"RequestId":10,"Response":{"Results":[{"NotifyWatcherId":"3","Error":null}]}}
[LOG] 42.45826 DEBUG juju.rpc.jsoncodec <- {"RequestId":12,"Type":"Uniter","Request":"CharmURL","Params":{"Entities":[{"Tag":"unit-wordpress-0"}]}}
[LOG] 42.45834 DEBUG juju.rpc.jsoncodec <- {"RequestId":13,"Type":"NotifyWatcher","Id":"3","Request":"Next","Params":{}}
[LOG] 42.45909 DEBUG juju.rpc.jsoncodec -> {"RequestId":12,"Response":{"Results":[{"Error":{"Message":"unit \"wordpress/0\" not found","Code":"not found"},"Result":"","Ok":false}]}}
[LOG] 42.45967 ERROR juju.worker.uniter.filter unit charm: unit "wordpress/0" not found
[LOG] 42.45975 DEBUG juju.rpc.jsoncodec <- {"RequestId":14,"Type":"NotifyWatcher","Id":"3","Request":"Stop","Params":{}}
[LOG] 42.45982 DEBUG juju.rpc.jsoncodec -> {"RequestId":13,"Error":"watcher has been stopped","ErrorCode":"stopped","Response":{}}
[LOG] 42.45986 DEBUG juju.rpc.jsoncodec -> {"RequestId":14,"Response":{}}
[LOG] 42.46002 DEBUG juju.rpc.jsoncodec <- {"RequestId":15,"Type":"NotifyWatcher","Id":"2","Request":"Stop","Params":{}}
[LOG] 42.46007 DEBUG juju.rpc.jsoncodec -> {"RequestId":11,"Error":"watcher has been stopped","ErrorCode":"stopped","Response":{}}
[LOG] 42.46012 DEBUG juju.rpc.jsoncodec -> {"RequestId":15,"Response":{}}
[LOG] 42.46020 ERROR juju.worker.uniter.filter unit "wordpress/0" not found
filter_test.go:105:
    s.assertAgentTerminates(c, f)
filter_test.go:120:
    c.Assert(f.Wait(), gc.Equals, worker.ErrTerminateAgent)
... obtained *params.Error = &params.Error{"not found", "unit \"wordpress/0\" not found"} ("unit \"wordpress/0\" not found")
... expected *errors.errorString = &errors.errorString{s:"agent should be terminated"} ("agent should be terminated")

[LOG] 42.46721 INFO juju.provider.dummy reset environment
[LOG] 42.46736 DEBUG juju.rpc.jsoncodec <- error: read tcp 127.0.0.1:38527: use of closed network connection (closing true)
[LOG] 42.47163 DEBUG juju.rpc.jsoncodec <- error: read tcp 127.0.0.1:38531: use of closed network connection (closing true)
[LOG] 42.47611 INFO juju MgoReset successfully reset admin password
[LOG] 42.48202 INFO juju MgoReset successfully reset admin password
[LOG] 42.48498 INFO juju MgoReset successfully reset admin password
OOPS: 39 passed, 1 FAILED
--- FAIL: TestPackage (160.79 seconds)
FAIL
FAIL	launchpad.net/juju-core/worker/uniter	161.049s
ok  	launchpad.net/juju-core/worker/uniter/charm	2.787s
ok  	launchpad.net/juju-core/worker/uniter/debug	0.088s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.015s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.459s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.346s
ok  	launchpad.net/juju-core/worker/upgrader	3.287s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
	launchpad.net/lpad
installing these packages with 'go test -i ./...' will speed future tests.

juju-core

Merge lp:~axwalk/juju-core/lp1234127-add-cloud-tools-pocket into lp:~go-bot/juju-core/trunk

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'environs/cloudinit/cloudinit.go'
 --- environs/cloudinit/cloudinit.go	2013-10-02 09:52:01 +0000
 +++ environs/cloudinit/cloudinit.go	2013-10-03 09:53:25 +0000
@@ -191,12 +191,18 @@
  		return nil, err
+ 	}
++	// Add the cloud archive cloud-tools pocket to apt sources
++	// for series that need it. This gives us up-to-date LXC,
++	// MongoDB, and other infrastructure.
++	cfg.MaybeAddCloudArchiveCloudTools(c)
++
  	if cfg.StateServer {
  		// disable the default mongodb installed by the mongodb-server package.
  		c.AddBootCmd(`echo ENABLE_MONGODB="no" > /etc/default/mongodb`)
  		if cfg.NeedMongoPPA() {
--			c.AddAptSource("ppa:juju/stable", "1024R/C8068B11")
++			const key = "" // key is loaded from PPA
++			c.AddAptSource("ppa:juju/stable", key)
+ 		}
  		c.AddPackage("mongodb-server")
  		certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)
@@ -377,11 +383,29 @@
  	return hosts
+ }
++// MaybeAddCloudArchiveCloudTools adds the cloud-archive cloud-tools
++// pocket to apt sources, if the series requires it.
++func (cfg *MachineConfig) MaybeAddCloudArchiveCloudTools(c *cloudinit.Config) {
++	series := cfg.Tools.Version.Series
++	if series != "precise" {
++		// Currently only precise; presumably we'll
++		// need to add each LTS in here as they're
++		// added to the cloud archive.
++		return
++	}
++	const url = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
++	const keyid = "EC4926EA"
++	const keyserver = "" // use default
++	name := fmt.Sprintf("deb %s %s-updates/cloud-tools main", url, series)
++	c.AddAptSourceWithKeyId(name, keyid, keyserver)
++}
++
  func (cfg *MachineConfig) NeedMongoPPA() bool {
  	series := cfg.Tools.Version.Series
  	// 11.10 and earlier are not supported.
++	// 12.04 can get a compatible version from the cloud-archive.
  	// 13.04 and later ship a compatible version in the archive.
--	return series == "precise" || series == "quantal"
++	return series == "quantal"
+ }
  func shquote(p string) string {
 === modified file 'environs/cloudinit/cloudinit_test.go'
 --- environs/cloudinit/cloudinit_test.go	2013-10-02 09:52:01 +0000
 +++ environs/cloudinit/cloudinit_test.go	2013-10-03 09:53:25 +0000
@@ -448,12 +448,17 @@
  		checkPackage(c, x, "lxc", hasLxc)
  		if test.cfg.StateServer {
  			checkPackage(c, x, "mongodb-server", true)
--			source := struct{ source, key string }{
++			source := struct{ source, keyid string }{
  				source: "ppa:juju/stable",
--				key:    "1024R/C8068B11",
+ 			}
  			checkAptSource(c, x, source, test.cfg.NeedMongoPPA())
+ 		}
++		source := struct{ source, keyid string }{
++			source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/cloud-tools main",
++			keyid:  "EC4926EA",
++		}
++		needCloudArchive := test.cfg.Tools.Version.Series == "precise"
++		checkAptSource(c, x, source, needCloudArchive)
+ 	}
+ }
@@ -551,7 +556,7 @@
  // CheckAptSources checks that the cloudinit will or won't install the given
  // source, depending on the value of match.
--func checkAptSource(c *gc.C, x map[interface{}]interface{}, source struct{ source, key string }, match bool) {
++func checkAptSource(c *gc.C, x map[interface{}]interface{}, source struct{ source, keyid string }, match bool) {
  	sources0 := x["apt_sources"]
  	if sources0 == nil {
  		if match {
@@ -565,7 +570,7 @@
  	found := false
  	for _, s0 := range sources {
  		s := s0.(map[interface{}]interface{})
--		if s["source"] == source.source && s["key"] == source.key {
++		if s["source"] == source.source && (source.keyid == "" || s["keyid"] == source.keyid) {
  			found = true
+ 		}
+ 	}