juju-core

Merge lp:~axwalk/juju-core/syslog-port-mutable into lp:~go-bot/juju-core/trunk

  1. syslog-port-mutable
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 2354
Proposed branch: lp:~axwalk/juju-core/syslog-port-mutable
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 50 lines (+0/-11)
3 files modified
cmd/juju/environment_test.go (+0/-1)
environs/config/config.go (+0/-1)
environs/config/config_test.go (+0/-9)
To merge this branch: bzr merge lp:~axwalk/juju-core/syslog-port-mutable
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+208269@code.launchpad.net

Commit message

Make syslog-port mutable

This is the first in a series of changes that
will change how we manage rsyslog configuration.
syslog-port will eventually need to be mutable
to handle upgrading from UDP to TLS.

https://codereview.appspot.com/68940043/

Description of the change

Make syslog-port mutable

This is the first in a series of changes that
will change how we manage rsyslog configuration.
syslog-port will eventually need to be mutable
to handle upgrading from UDP to TLS.

https://codereview.appspot.com/68940043/

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+208269_code.launchpad.net,

Message:
Please take a look.

Description:
Make syslog-port mutable

This is the first in a series of changes that
will change how we manage rsyslog configuration.
syslog-port will eventually need to be mutable
to handle upgrading from UDP to TLS.

https://code.launchpad.net/~axwalk/juju-core/syslog-port-mutable/+merge/208269

(do not edit description out of merge proposal)

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

Affected files (+2, -11 lines):
   A [revision details]
   M cmd/juju/environment_test.go
   M environs/config/config.go
   M environs/config/config_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-20140225144730-q94k9zc09x4xifz0
+New revision: <email address hidden>

Index: cmd/juju/environment_test.go
=== modified file 'cmd/juju/environment_test.go'
--- cmd/juju/environment_test.go 2013-11-28 09:11:12 +0000
+++ cmd/juju/environment_test.go 2014-02-25 13:27:10 +0000
@@ -167,7 +167,6 @@
   "firewall-mode": "global",
   "state-port": "1",
   "api-port": "666",
- "syslog-port": "42",
  }

  func (s *SetEnvironmentSuite) TestImmutableConfigValues(c *gc.C) {

Index: environs/config/config.go
=== modified file 'environs/config/config.go'
--- environs/config/config.go 2014-02-21 10:00:22 +0000
+++ environs/config/config.go 2014-02-26 04:16:58 +0000
@@ -791,7 +791,6 @@
   "firewall-mode",
   "state-port",
   "api-port",
- "syslog-port",
   "bootstrap-timeout",
   "bootstrap-retry-delay",
   "bootstrap-addresses-delay",

Index: environs/config/config_test.go
=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go 2014-02-21 10:00:22 +0000
+++ environs/config/config_test.go 2014-02-26 04:16:58 +0000
@@ -1072,11 +1072,6 @@
   new: testing.Attrs{"api-port": 42},
   err: `cannot change api-port from 17070 to 42`,
  }, {
- about: "Cannot change the syslog-port",
- old: testing.Attrs{"syslog-port": 345},
- new: testing.Attrs{"syslog-port": 42},
- err: `cannot change syslog-port from 345 to 42`,
-}, {
   about: "Can change the state-port from explicit-default to
implicit-default",
   old: testing.Attrs{"state-port": config.DefaultStatePort},
  }, {
@@ -1097,10 +1092,6 @@
   new: testing.Attrs{"api-port": 42},
   err: `cannot change api-port from 17070 to 42`,
  }, {
- about: "Cannot change the syslog-port from implicit-default to different
value",
- new: testing.Attrs{"syslog-port": 42},
- err: `cannot change syslog-port from 514 to 42`,
-}, {
   about: "Cannot change the bootstrap-timeout from implicit-default to
different value",
   new: testing.Attrs{"bootstrap-timeout": 5},
   err: `cannot change bootstrap-timeout from 600 to 5`,

Revision history for this message
Ian Booth (wallyworld) wrote :

LGTM

https://codereview.appspot.com/68940043/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (9.4 KiB)

The attempt to merge lp:~axwalk/juju-core/syslog-port-mutable into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.018s
ok launchpad.net/juju-core/agent 1.229s
ok launchpad.net/juju-core/agent/tools 0.247s
ok launchpad.net/juju-core/bzr 7.219s
ok launchpad.net/juju-core/cert 3.195s
ok launchpad.net/juju-core/charm 0.621s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.037s
ok launchpad.net/juju-core/cloudinit/sshinit 1.252s
ok launchpad.net/juju-core/cmd 0.259s
ok launchpad.net/juju-core/cmd/charm-admin 0.835s
? 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 245.648s
ok launchpad.net/juju-core/cmd/jujud 61.056s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 11.570s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.051s
ok launchpad.net/juju-core/container/kvm 0.276s
ok launchpad.net/juju-core/container/kvm/mock 0.037s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.280s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.256s
ok launchpad.net/juju-core/environs 3.093s
ok launchpad.net/juju-core/environs/bootstrap 4.725s
ok launchpad.net/juju-core/environs/cloudinit 0.700s
ok launchpad.net/juju-core/environs/config 3.156s
ok launchpad.net/juju-core/environs/configstore 0.041s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 0.939s
ok launchpad.net/juju-core/environs/imagemetadata 0.679s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.060s
ok launchpad.net/juju-core/environs/jujutest 0.245s
ok launchpad.net/juju-core/environs/manual 16.009s
ok launchpad.net/juju-core/environs/simplestreams 0.377s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.184s
ok launchpad.net/juju-core/environs/storage 1.163s
ok launchpad.net/juju-core/environs/sync 34.321s
ok launchpad.net/juju-core/environs/testing 0.289s
ok launchpad.net/juju-core/environs/tools 6.923s
? 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.033s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 24.552s
ok launchpad.net/juju-core/juju/osenv 0.025s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.026s
? launchpad.net/juju-core/log...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/juju/environment_test.go'
2--- cmd/juju/environment_test.go 2013-11-28 09:11:12 +0000
3+++ cmd/juju/environment_test.go 2014-02-26 04:30:39 +0000
4@@ -167,7 +167,6 @@
5 "firewall-mode": "global",
6 "state-port": "1",
7 "api-port": "666",
8- "syslog-port": "42",
9 }
10
11 func (s *SetEnvironmentSuite) TestImmutableConfigValues(c *gc.C) {
12
13=== modified file 'environs/config/config.go'
14--- environs/config/config.go 2014-02-21 10:00:22 +0000
15+++ environs/config/config.go 2014-02-26 04:30:39 +0000
16@@ -791,7 +791,6 @@
17 "firewall-mode",
18 "state-port",
19 "api-port",
20- "syslog-port",
21 "bootstrap-timeout",
22 "bootstrap-retry-delay",
23 "bootstrap-addresses-delay",
24
25=== modified file 'environs/config/config_test.go'
26--- environs/config/config_test.go 2014-02-21 10:00:22 +0000
27+++ environs/config/config_test.go 2014-02-26 04:30:39 +0000
28@@ -1072,11 +1072,6 @@
29 new: testing.Attrs{"api-port": 42},
30 err: `cannot change api-port from 17070 to 42`,
31 }, {
32- about: "Cannot change the syslog-port",
33- old: testing.Attrs{"syslog-port": 345},
34- new: testing.Attrs{"syslog-port": 42},
35- err: `cannot change syslog-port from 345 to 42`,
36-}, {
37 about: "Can change the state-port from explicit-default to implicit-default",
38 old: testing.Attrs{"state-port": config.DefaultStatePort},
39 }, {
40@@ -1097,10 +1092,6 @@
41 new: testing.Attrs{"api-port": 42},
42 err: `cannot change api-port from 17070 to 42`,
43 }, {
44- about: "Cannot change the syslog-port from implicit-default to different value",
45- new: testing.Attrs{"syslog-port": 42},
46- err: `cannot change syslog-port from 514 to 42`,
47-}, {
48 about: "Cannot change the bootstrap-timeout from implicit-default to different value",
49 new: testing.Attrs{"bootstrap-timeout": 5},
50 err: `cannot change bootstrap-timeout from 600 to 5`,

Subscribers

People subscribed via source and target branches

to status/vote changes: