Skip to content

Commit d2b5ed7

Browse files
wallyworldwallyworld
committed
Rename state server to controller
1 parent 9e7dbcf commit d2b5ed7

File tree

216 files changed

+1333
-1333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+1333
-1333
lines changed

‎agent/agent.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const (
161161
AgentServiceName = "AGENT_SERVICE_NAME"
162162
MongoOplogSize = "MONGO_OPLOG_SIZE"
163163
NumaCtlPreference = "NUMA_CTL_PREFERENCE"
164-
AllowsSecureConnection = "SECURE_STATESERVER_CONNECTION"
164+
AllowsSecureConnection = "SECURE_CONTROLLER_CONNECTION"
165165
)
166166

167167
// The Config interface is the sole way that the agent gets access to the
@@ -214,15 +214,15 @@ type Config interface {
214214
WriteCommands(renderer shell.Renderer) ([]string, error)
215215

216216
// StateServingInfo returns the details needed to run
217-
// a state server and reports whether those details
217+
// a controller and reports whether those details
218218
// are available
219219
StateServingInfo() (params.StateServingInfo, bool)
220220

221221
// APIInfo returns details for connecting to the API server and
222222
// reports whether the details are available.
223223
APIInfo() (*api.Info, bool)
224224

225-
// MongoInfo returns details for connecting to the state server's mongo
225+
// MongoInfo returns details for connecting to the controller's mongo
226226
// database and reports whether those details are available
227227
MongoInfo() (*mongo.MongoInfo, bool)
228228

@@ -292,7 +292,7 @@ type configSetterOnly interface {
292292
Migrate(MigrateParams) error
293293

294294
// SetStateServingInfo sets the information needed
295-
// to run a state server
295+
// to run a controller
296296
SetStateServingInfo(info params.StateServingInfo)
297297
}
298298

@@ -443,13 +443,13 @@ func NewAgentConfig(configParams AgentConfigParams) (ConfigSetterWriter, error)
443443
}
444444

445445
// NewStateMachineConfig returns a configuration suitable for
446-
// a machine running the state server.
446+
// a machine running the controller.
447447
func NewStateMachineConfig(configParams AgentConfigParams, serverInfo params.StateServingInfo) (ConfigSetterWriter, error) {
448448
if serverInfo.Cert == "" {
449-
return nil, errors.Trace(requiredError("state server cert"))
449+
return nil, errors.Trace(requiredError("controller cert"))
450450
}
451451
if serverInfo.PrivateKey == "" {
452-
return nil, errors.Trace(requiredError("state server key"))
452+
return nil, errors.Trace(requiredError("controller key"))
453453
}
454454
if serverInfo.CAPrivateKey == "" {
455455
return nil, errors.Trace(requiredError("ca cert key"))
@@ -720,7 +720,7 @@ func (c *configInternal) check() error {
720720
return errors.Trace(requiredError("state or API addresses"))
721721
}
722722
if c.stateDetails != nil {
723-
if err := checkAddrs(c.stateDetails.addresses, "state server address"); err != nil {
723+
if err := checkAddrs(c.stateDetails.addresses, "controller address"); err != nil {
724724
return err
725725
}
726726
}
@@ -775,9 +775,9 @@ func (c *configInternal) APIInfo() (*api.Info, bool) {
775775
if c.apiDetails == nil || c.apiDetails.addresses == nil {
776776
return nil, false
777777
}
778-
servingInfo, isStateServer := c.StateServingInfo()
778+
servingInfo, isController := c.StateServingInfo()
779779
addrs := c.apiDetails.addresses
780-
if isStateServer {
780+
if isController {
781781
port := servingInfo.APIPort
782782
localAPIAddr := net.JoinHostPort("localhost", strconv.Itoa(port))
783783
if c.preferIPv6 {

‎agent/agent_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ var agentConfigTests = []struct {
109109
Model: testing.ModelTag,
110110
StateAddresses: []string{"localhost:8080", "bad-address"},
111111
},
112-
checkErr: `invalid state server address "bad-address"`,
112+
checkErr: `invalid controller address "bad-address"`,
113113
}, {
114114
about: "invalid api address",
115115
params: agent.AgentConfigParams{
@@ -445,14 +445,14 @@ func (*suite) TestNewStateMachineConfig(c *gc.C) {
445445
inspectConfig func(*gc.C, agent.Config)
446446
}
447447
var tests = []testStruct{{
448-
about: "missing state server cert",
449-
checkErr: "state server cert not found in configuration",
448+
about: "missing controller cert",
449+
checkErr: "controller cert not found in configuration",
450450
}, {
451-
about: "missing state server key",
451+
about: "missing controller key",
452452
servingInfo: params.StateServingInfo{
453453
Cert: "server cert",
454454
},
455-
checkErr: "state server key not found in configuration",
455+
checkErr: "controller key not found in configuration",
456456
}, {
457457
about: "missing ca cert key",
458458
servingInfo: params.StateServingInfo{

‎agent/bootstrap.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
const (
24-
// BootstrapNonce is used as a nonce for the state server machine.
24+
// BootstrapNonce is used as a nonce for the controller machine.
2525
BootstrapNonce = "user-admin:bootstrap"
2626
)
2727

@@ -54,14 +54,14 @@ type BootstrapMachineConfig struct {
5454
const BootstrapMachineId = "0"
5555

5656
// InitializeState should be called on the bootstrap machine's agent
57-
// configuration. It uses that information to create the state server, dial the
58-
// state server, and initialize it. It also generates a new password for the
57+
// configuration. It uses that information to create the controller, dial the
58+
// controller, and initialize it. It also generates a new password for the
5959
// bootstrap machine and calls Write to save the the configuration.
6060
//
6161
// The envCfg values will be stored in the state's ModelConfig; the
6262
// machineCfg values will be used to configure the bootstrap Machine,
6363
// and its constraints will be also be used for the model-level
64-
// constraints. The connection to the state server will respect the
64+
// constraints. The connection to the controller will respect the
6565
// given timeout parameter.
6666
//
6767
// InitializeState returns the newly initialized state and bootstrap

‎agent/format-1.16.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ type format_1_16Serialization struct {
4141
OldPassword string
4242
Values map[string]string
4343

44-
// Only state server machines have these next three items
45-
StateServerCert string `yaml:",omitempty"`
46-
StateServerKey string `yaml:",omitempty"`
47-
APIPort int `yaml:",omitempty"`
44+
// Only controller machines have these next three items
45+
ControllerCert string `yaml:",omitempty"`
46+
ControllerKey string `yaml:",omitempty"`
47+
APIPort int `yaml:",omitempty"`
4848
}
4949

5050
func init() {
@@ -78,11 +78,11 @@ func (formatter_1_16) unmarshal(data []byte) (*configInternal, error) {
7878
if err != nil {
7979
return nil, err
8080
}
81-
stateServerCert, err := decode64(format.StateServerCert)
81+
controllerCert, err := decode64(format.ControllerCert)
8282
if err != nil {
8383
return nil, err
8484
}
85-
stateServerKey, err := decode64(format.StateServerKey)
85+
controllerKey, err := decode64(format.ControllerKey)
8686
if err != nil {
8787
return nil, err
8888
}
@@ -111,10 +111,10 @@ func (formatter_1_16) unmarshal(data []byte) (*configInternal, error) {
111111
}
112112
}
113113

114-
if len(stateServerKey) != 0 {
114+
if len(controllerKey) != 0 {
115115
config.servingInfo = &params.StateServingInfo{
116-
Cert: string(stateServerCert),
117-
PrivateKey: string(stateServerKey),
116+
Cert: string(controllerCert),
117+
PrivateKey: string(controllerKey),
118118
APIPort: format.APIPort,
119119
}
120120
// There's a private key, then we need the state

‎agent/format-1.16_whitebox_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (s *format_1_16Suite) TestMissingAttributes(c *gc.C) {
5454

5555
c.Assert(configLogDir, gc.Equals, logPath)
5656
c.Assert(configDataDir, gc.Equals, realDataDir)
57-
// Test data doesn't include a StateServerKey so StateServingInfo
57+
// Test data doesn't include a ControllerKey so StateServingInfo
5858
// should *not* be available
5959
_, available := readConfig.StateServingInfo()
6060
c.Assert(available, jc.IsFalse)
@@ -121,8 +121,8 @@ values:
121121
SHARED_STORAGE_DIR: /home/user/.juju/local/shared-storage
122122
STORAGE_ADDR: 10.0.3.1:8040
123123
STORAGE_DIR: /home/user/.juju/local/storage
124-
stateservercert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNJakNDQVkyZ0F3SUJBZ0lCQURBTEJna3Foa2lHOXcwQkFRVXdRekVOTUFzR0ExVUVDaE1FYW5WcWRURXkKTURBR0ExVUVBd3dwYW5WcWRTMW5aVzVsY21GMFpXUWdRMEVnWm05eUlHVnVkbWx5YjI1dFpXNTBJQ0pzYjJOaApiQ0l3SGhjTk1UUXdNekExTVRJeE9ESXlXaGNOTWpRd016QTFNVEl5TXpJeVdqQWJNUTB3Q3dZRFZRUUtFd1JxCmRXcDFNUW93Q0FZRFZRUURFd0VxTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdVA0dTAKQjZtbGs0V0g3SHFvOXhkSFp4TWtCUVRqV2VLTkhERzFMb21SWmc2RHA4Z0VQK0ZNVm5IaUprZW1pQnJNSEk3OAo5bG4zSVRBT0NJT0xna0NkN3ZsaDJub2FheTlSeXpUaG9PZ0RMSzVpR0VidmZDeEFWZThhWDQvbThhOGNLWE9TCmJJZTZFNnVtb0wza0JNaEdiL1QrYW1xbHRjaHVNRXJhanJSVit3SURBUUFCbzFJd1VEQU9CZ05WSFE4QkFmOEUKQkFNQ0FCQXdIUVlEVlIwT0JCWUVGRTV1RFg3UlRjckF2ajFNcWpiU2w1M21pR0NITUI4R0ExVWRJd1FZTUJhQQpGSlVMSmVZSGxEbHZSd09KMHFncnpnMHJWRmVFTUFzR0NTcUdTSWIzRFFFQkJRT0JnUUJUNC8vZkpESUcxM2dxClBiamNnUTN6eHh6TG12STY5Ty8zMFFDbmIrUGZObDRET0U1SktwVE5OTjhkOEJEQWZPYStvWE5neEM3VTZXdjUKZjBYNzEyRnlNdUc3VXJEVkNDY0kxS3JSQ0F0THlPWUREL0ZPblBwSWdVQjF1bFRnOGlRUzdlTjM2d0NEL21wVApsUVVUS2FuU00yMnhnWWJKazlRY1dBSzQ0ZjA4SEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
125-
stateserverkey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUN1UDR1MEI2bWxrNFdIN0hxbzl4ZEhaeE1rQlFUaldlS05IREcxTG9tUlpnNkRwOGdFClArRk1WbkhpSmtlbWlCck1ISTc4OWxuM0lUQU9DSU9MZ2tDZDd2bGgybm9hYXk5Unl6VGhvT2dETEs1aUdFYnYKZkN4QVZlOGFYNC9tOGE4Y0tYT1NiSWU2RTZ1bW9MM2tCTWhHYi9UK2FtcWx0Y2h1TUVyYWpyUlYrd0lEQVFBQgpBb0dBRERJZ2FoSmJPbDZQNndxUEwwSlVHOGhJRzY1S1FFdHJRdXNsUTRRbFZzcm8yeWdrSkwvLzJlTDNCNWdjClRiaWEvNHhFS2Nwb1U1YThFVTloUGFONU9EYnlkVEsxQ1I3R2JXSGkwWm1LbGZCUlR4bUpxakdKVU1CSmI4a0QKNStpMzlvcXdQS3dnaXoyTVR5SHZKZFFJVHB0ZDVrbEQyYjU1by9YWFRCTnk2NGtDUVFEbXRFWHNTL2kxTm5pSwozZVJkeHM4UVFGN0pKVG5SR042ZUh6ZHlXb242Zjl2ZkxrSDROWUdxcFUydjVBNUl1Nno3K3NJdXVHU2ZSeEI1CktrZVFXdlVQQWtFQXdWcVdlczdmc3NLbUFCZGxER3ozYzNxMjI2eVVaUE00R3lTb1cxYXZsYzJ1VDVYRm9vVUsKNjRpUjJuU2I1OHZ2bGY1RjRRMnJuRjh2cFRLcFJwK0lWUUpBTlcwZ0dFWEx0ZU9FYk54UUMydUQva1o1N09rRApCNnBUdTVpTkZaMWtBSy9sY2p6YktDanorMW5Hc09vR2FNK1ZrdEVTY1JGZ3RBWVlDWWRDQldzYS93SkFROWJXCnlVdmdMTVlpbkJHWlFKelN6VStXN01oR1lJejllSGlLSVZIdTFTNlBKQmsyZUdrWmhiNHEvbXkvYnJxYzJ4R1YKenZxTzVaUjRFUXdQWEZvSTZRSkFkeVdDMllOTTF2a1BuWnJqZzNQQXFHRHJQMHJwNEZ0bFV4alh0ay8vcW9hNgpRcXVYcE9vNjd4THRieW1PTlJTdDFiZGE5ZE5tbGljMFVNZ0JQRHgrYnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
124+
controllercert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNJakNDQVkyZ0F3SUJBZ0lCQURBTEJna3Foa2lHOXcwQkFRVXdRekVOTUFzR0ExVUVDaE1FYW5WcWRURXkKTURBR0ExVUVBd3dwYW5WcWRTMW5aVzVsY21GMFpXUWdRMEVnWm05eUlHVnVkbWx5YjI1dFpXNTBJQ0pzYjJOaApiQ0l3SGhjTk1UUXdNekExTVRJeE9ESXlXaGNOTWpRd016QTFNVEl5TXpJeVdqQWJNUTB3Q3dZRFZRUUtFd1JxCmRXcDFNUW93Q0FZRFZRUURFd0VxTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDdVA0dTAKQjZtbGs0V0g3SHFvOXhkSFp4TWtCUVRqV2VLTkhERzFMb21SWmc2RHA4Z0VQK0ZNVm5IaUprZW1pQnJNSEk3OAo5bG4zSVRBT0NJT0xna0NkN3ZsaDJub2FheTlSeXpUaG9PZ0RMSzVpR0VidmZDeEFWZThhWDQvbThhOGNLWE9TCmJJZTZFNnVtb0wza0JNaEdiL1QrYW1xbHRjaHVNRXJhanJSVit3SURBUUFCbzFJd1VEQU9CZ05WSFE4QkFmOEUKQkFNQ0FCQXdIUVlEVlIwT0JCWUVGRTV1RFg3UlRjckF2ajFNcWpiU2w1M21pR0NITUI4R0ExVWRJd1FZTUJhQQpGSlVMSmVZSGxEbHZSd09KMHFncnpnMHJWRmVFTUFzR0NTcUdTSWIzRFFFQkJRT0JnUUJUNC8vZkpESUcxM2dxClBiamNnUTN6eHh6TG12STY5Ty8zMFFDbmIrUGZObDRET0U1SktwVE5OTjhkOEJEQWZPYStvWE5neEM3VTZXdjUKZjBYNzEyRnlNdUc3VXJEVkNDY0kxS3JSQ0F0THlPWUREL0ZPblBwSWdVQjF1bFRnOGlRUzdlTjM2d0NEL21wVApsUVVUS2FuU00yMnhnWWJKazlRY1dBSzQ0ZjA4SEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
125+
controllerkey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDV3dJQkFBS0JnUUN1UDR1MEI2bWxrNFdIN0hxbzl4ZEhaeE1rQlFUaldlS05IREcxTG9tUlpnNkRwOGdFClArRk1WbkhpSmtlbWlCck1ISTc4OWxuM0lUQU9DSU9MZ2tDZDd2bGgybm9hYXk5Unl6VGhvT2dETEs1aUdFYnYKZkN4QVZlOGFYNC9tOGE4Y0tYT1NiSWU2RTZ1bW9MM2tCTWhHYi9UK2FtcWx0Y2h1TUVyYWpyUlYrd0lEQVFBQgpBb0dBRERJZ2FoSmJPbDZQNndxUEwwSlVHOGhJRzY1S1FFdHJRdXNsUTRRbFZzcm8yeWdrSkwvLzJlTDNCNWdjClRiaWEvNHhFS2Nwb1U1YThFVTloUGFONU9EYnlkVEsxQ1I3R2JXSGkwWm1LbGZCUlR4bUpxakdKVU1CSmI4a0QKNStpMzlvcXdQS3dnaXoyTVR5SHZKZFFJVHB0ZDVrbEQyYjU1by9YWFRCTnk2NGtDUVFEbXRFWHNTL2kxTm5pSwozZVJkeHM4UVFGN0pKVG5SR042ZUh6ZHlXb242Zjl2ZkxrSDROWUdxcFUydjVBNUl1Nno3K3NJdXVHU2ZSeEI1CktrZVFXdlVQQWtFQXdWcVdlczdmc3NLbUFCZGxER3ozYzNxMjI2eVVaUE00R3lTb1cxYXZsYzJ1VDVYRm9vVUsKNjRpUjJuU2I1OHZ2bGY1RjRRMnJuRjh2cFRLcFJwK0lWUUpBTlcwZ0dFWEx0ZU9FYk54UUMydUQva1o1N09rRApCNnBUdTVpTkZaMWtBSy9sY2p6YktDanorMW5Hc09vR2FNK1ZrdEVTY1JGZ3RBWVlDWWRDQldzYS93SkFROWJXCnlVdmdMTVlpbkJHWlFKelN6VStXN01oR1lJejllSGlLSVZIdTFTNlBKQmsyZUdrWmhiNHEvbXkvYnJxYzJ4R1YKenZxTzVaUjRFUXdQWEZvSTZRSkFkeVdDMllOTTF2a1BuWnJqZzNQQXFHRHJQMHJwNEZ0bFV4alh0ay8vcW9hNgpRcXVYcE9vNjd4THRieW1PTlJTdDFiZGE5ZE5tbGljMFVNZ0JQRHgrYnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
126126
apiport: 17070
127127
`[1:]
128128

@@ -155,7 +155,7 @@ values:
155155
SHARED_STORAGE_DIR: /home/rog/.juju/local/shared-storage
156156
STORAGE_ADDR: 10.0.3.1:8040
157157
STORAGE_DIR: /home/rog/.juju/local/storage
158-
stateservercert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNJakNDQVkyZ0F3SUJBZ0lCQURBTEJna3Foa2lHOXcwQkFRVXdRekVOTUFzR0ExVUVDaE1FYW5WcWRURXkKTURBR0ExVUVBd3dwYW5WcWRTMW5aVzVsY21GMFpXUWdRMEVnWm05eUlHVnVkbWx5YjI1dFpXNTBJQ0pzYjJOaApiQ0l3SGhjTk1UUXdOREF4TVRNd016SXlXaGNOTWpRd05EQXhNVE13T0RJeVdqQWJNUTB3Q3dZRFZRUUtFd1JxCmRXcDFNUW93Q0FZRFZRUURFd0VxTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDa1E1RzEKbUFuQU0wb3REVzVwREo3R3pQbTg5OUtySlVlR0NIZytGV2l0d1RETnJiK0NhYk1TYWRsc3JYb0crYjdETDFIcApXNTdnQXZoNjBTeUFLWHJCVW9tMG1pdVI1QkhYeitpWkZsZDZHS0UySTFIMUlON0pldUdmTURyVUN4WlVYNkdkCjVlcStUU3JvQ3ZPVGxDYWFtNDRkaHd0S1JHMlFQQ2RYbTNSbWxRSURBUUFCbzFJd1VEQU9CZ05WSFE4QkFmOEUKQkFNQ0FCQXdIUVlEVlIwT0JCWUVGTElWeDdmUVJFUkRGZ3hCcWh4b3puMHZueUlXTUI4R0ExVWRJd1FZTUJhQQpGQ0JYZ2lxaUpIQVlWeUZQN0dYUktzZHFZRFc4TUFzR0NTcUdTSWIzRFFFQkJRT0JnUUFKeW9yaEtLa20ySEFBCmNtS2RyRFNyRlZraElxUFlnc0p6STVTOXRBb0lxRDYwMUZ2eVh1aE50STlwR21ZS2tEd1J0Q2JXNy9nL1RMYVIKbVhXcEpqSDRMNlNLbEFkRFFVMVpPejMwRTdlR3F6aXp3dUdTUHB1VDdjUm5wOVVYdEwrRGZPc2N4WDNwNXMvMwpobmJGdFZGVWllejJRVDNoemo4VTRocXlWTENNZkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
159-
stateserverkey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDWEFJQkFBS0JnUUNrUTVHMW1BbkFNMG90RFc1cERKN0d6UG04OTlLckpVZUdDSGcrRldpdHdURE5yYitDCmFiTVNhZGxzclhvRytiN0RMMUhwVzU3Z0F2aDYwU3lBS1hyQlVvbTBtaXVSNUJIWHoraVpGbGQ2R0tFMkkxSDEKSU43SmV1R2ZNRHJVQ3haVVg2R2Q1ZXErVFNyb0N2T1RsQ2FhbTQ0ZGh3dEtSRzJRUENkWG0zUm1sUUlEQVFBQgpBb0dBY3ZvODFxQTZTd2RicDFkY2JqbUFOZVVwOWNSOStIL2FwWTN1Skg2MXk5R0xTSnlTalVWUks5VmRkRDJsClNaYXNtVkRaQS8rMm9GUlQreHZKQzFoOWJBNm51NzBxczZXUXBQczQ5WGxhSFdNWXJ0dEV5UDVXeVE4ZWNPWlkKazJZeWJsN3ZQVnhOS1VXdk85L0N3MDgyU2FWZUJGbktvSkRxM1NZZHAzYnhWOEVDUVFEQW85cnBibTFnaENkcApIUFNIQU1SY0lOZUpLcHoxM3QxS3ErN1E3YUZOOWsxYnZvWm8yV2FZZ1pRbXBRL1RoNnl3dy9teWJscmxpMUxGCm5Vc25HZzV4QWtFQTJrcDNnV1B1aXN1bHoyMU1hQmtaN0pLUzVKUXkyQlFUM2ZuM0Nua3hFa2xRdGZ2VnFBN1cKMndPbG9acUFBM2ZCRVUycWEyVmptejg1WGZKUVZYbjBaUUpCQUljaTZ2Q1NESnlHV0hjK1hyTk44SEdJZ0dxeQp3QVVpNEMzL3lybzUyTXd1R2pwZnZ6NVNNOHlNS2ZlcUZ4NFdzU2dYY2xTZllaaGhVaUZhcEZ1N3hhRUNRR2lWCmV2SWtGYnFyM1RJbk5JOC9UM3RYc2tjUGRkaXVyZUlSQzdvWjNGZmRobXphVGtBcGMra1VzenRjMFc1WDVzbEsKZzViV3ljVXNvbWlQV3N2SkZUMENRQTRseEVjN0ZKd0xmRTVRMGpoUkc0d0Jjdll5YUtNRzNiQi9YYzlzZU1uUwpjU3RqM2ZzZkIwYTNldENMZW1PTnpaWkV1YVlFUjZiblR6R3BqdFhwQ3lBPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
158+
controllercert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNJakNDQVkyZ0F3SUJBZ0lCQURBTEJna3Foa2lHOXcwQkFRVXdRekVOTUFzR0ExVUVDaE1FYW5WcWRURXkKTURBR0ExVUVBd3dwYW5WcWRTMW5aVzVsY21GMFpXUWdRMEVnWm05eUlHVnVkbWx5YjI1dFpXNTBJQ0pzYjJOaApiQ0l3SGhjTk1UUXdOREF4TVRNd016SXlXaGNOTWpRd05EQXhNVE13T0RJeVdqQWJNUTB3Q3dZRFZRUUtFd1JxCmRXcDFNUW93Q0FZRFZRUURFd0VxTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBQTRHTkFEQ0JpUUtCZ1FDa1E1RzEKbUFuQU0wb3REVzVwREo3R3pQbTg5OUtySlVlR0NIZytGV2l0d1RETnJiK0NhYk1TYWRsc3JYb0crYjdETDFIcApXNTdnQXZoNjBTeUFLWHJCVW9tMG1pdVI1QkhYeitpWkZsZDZHS0UySTFIMUlON0pldUdmTURyVUN4WlVYNkdkCjVlcStUU3JvQ3ZPVGxDYWFtNDRkaHd0S1JHMlFQQ2RYbTNSbWxRSURBUUFCbzFJd1VEQU9CZ05WSFE4QkFmOEUKQkFNQ0FCQXdIUVlEVlIwT0JCWUVGTElWeDdmUVJFUkRGZ3hCcWh4b3puMHZueUlXTUI4R0ExVWRJd1FZTUJhQQpGQ0JYZ2lxaUpIQVlWeUZQN0dYUktzZHFZRFc4TUFzR0NTcUdTSWIzRFFFQkJRT0JnUUFKeW9yaEtLa20ySEFBCmNtS2RyRFNyRlZraElxUFlnc0p6STVTOXRBb0lxRDYwMUZ2eVh1aE50STlwR21ZS2tEd1J0Q2JXNy9nL1RMYVIKbVhXcEpqSDRMNlNLbEFkRFFVMVpPejMwRTdlR3F6aXp3dUdTUHB1VDdjUm5wOVVYdEwrRGZPc2N4WDNwNXMvMwpobmJGdFZGVWllejJRVDNoemo4VTRocXlWTENNZkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
159+
controllerkey: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlDWEFJQkFBS0JnUUNrUTVHMW1BbkFNMG90RFc1cERKN0d6UG04OTlLckpVZUdDSGcrRldpdHdURE5yYitDCmFiTVNhZGxzclhvRytiN0RMMUhwVzU3Z0F2aDYwU3lBS1hyQlVvbTBtaXVSNUJIWHoraVpGbGQ2R0tFMkkxSDEKSU43SmV1R2ZNRHJVQ3haVVg2R2Q1ZXErVFNyb0N2T1RsQ2FhbTQ0ZGh3dEtSRzJRUENkWG0zUm1sUUlEQVFBQgpBb0dBY3ZvODFxQTZTd2RicDFkY2JqbUFOZVVwOWNSOStIL2FwWTN1Skg2MXk5R0xTSnlTalVWUks5VmRkRDJsClNaYXNtVkRaQS8rMm9GUlQreHZKQzFoOWJBNm51NzBxczZXUXBQczQ5WGxhSFdNWXJ0dEV5UDVXeVE4ZWNPWlkKazJZeWJsN3ZQVnhOS1VXdk85L0N3MDgyU2FWZUJGbktvSkRxM1NZZHAzYnhWOEVDUVFEQW85cnBibTFnaENkcApIUFNIQU1SY0lOZUpLcHoxM3QxS3ErN1E3YUZOOWsxYnZvWm8yV2FZZ1pRbXBRL1RoNnl3dy9teWJscmxpMUxGCm5Vc25HZzV4QWtFQTJrcDNnV1B1aXN1bHoyMU1hQmtaN0pLUzVKUXkyQlFUM2ZuM0Nua3hFa2xRdGZ2VnFBN1cKMndPbG9acUFBM2ZCRVUycWEyVmptejg1WGZKUVZYbjBaUUpCQUljaTZ2Q1NESnlHV0hjK1hyTk44SEdJZ0dxeQp3QVVpNEMzL3lybzUyTXd1R2pwZnZ6NVNNOHlNS2ZlcUZ4NFdzU2dYY2xTZllaaGhVaUZhcEZ1N3hhRUNRR2lWCmV2SWtGYnFyM1RJbk5JOC9UM3RYc2tjUGRkaXVyZUlSQzdvWjNGZmRobXphVGtBcGMra1VzenRjMFc1WDVzbEsKZzViV3ljVXNvbWlQV3N2SkZUMENRQTRseEVjN0ZKd0xmRTVRMGpoUkc0d0Jjdll5YUtNRzNiQi9YYzlzZU1uUwpjU3RqM2ZzZkIwYTNldENMZW1PTnpaWkV1YVlFUjZiblR6R3BqdFhwQ3lBPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
160160
apiport: 17070
161161
`

‎agent/format-1.18.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ type format_1_18Serialization struct {
4949

5050
PreferIPv6 bool `yaml:"prefer-ipv6,omitempty"`
5151

52-
// Only state server machines have these next items set.
53-
StateServerCert string `yaml:",omitempty"`
54-
StateServerKey string `yaml:",omitempty"`
55-
CAPrivateKey string `yaml:",omitempty"`
56-
APIPort int `yaml:",omitempty"`
57-
StatePort int `yaml:",omitempty"`
58-
SharedSecret string `yaml:",omitempty"`
59-
SystemIdentity string `yaml:",omitempty"`
52+
// Only controller machines have these next items set.
53+
ControllerCert string `yaml:",omitempty"`
54+
ControllerKey string `yaml:",omitempty"`
55+
CAPrivateKey string `yaml:",omitempty"`
56+
APIPort int `yaml:",omitempty"`
57+
StatePort int `yaml:",omitempty"`
58+
SharedSecret string `yaml:",omitempty"`
59+
SystemIdentity string `yaml:",omitempty"`
6060
}
6161

6262
func init() {
@@ -118,10 +118,10 @@ func (formatter_1_18) unmarshal(data []byte) (*configInternal, error) {
118118
format.APIPassword,
119119
}
120120
}
121-
if len(format.StateServerKey) != 0 {
121+
if len(format.ControllerKey) != 0 {
122122
config.servingInfo = &params.StateServingInfo{
123-
Cert: format.StateServerCert,
124-
PrivateKey: format.StateServerKey,
123+
Cert: format.ControllerCert,
124+
PrivateKey: format.ControllerKey,
125125
CAPrivateKey: format.CAPrivateKey,
126126
APIPort: format.APIPort,
127127
StatePort: format.StatePort,
@@ -171,8 +171,8 @@ func (formatter_1_18) marshal(config *configInternal) ([]byte, error) {
171171
PreferIPv6: config.preferIPv6,
172172
}
173173
if config.servingInfo != nil {
174-
format.StateServerCert = config.servingInfo.Cert
175-
format.StateServerKey = config.servingInfo.PrivateKey
174+
format.ControllerCert = config.servingInfo.Cert
175+
format.ControllerKey = config.servingInfo.PrivateKey
176176
format.CAPrivateKey = config.servingInfo.CAPrivateKey
177177
format.APIPort = config.servingInfo.APIPort
178178
format.StatePort = config.servingInfo.StatePort

‎agent/format-1.18_whitebox_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ values:
136136
PROVIDER_TYPE: local
137137
STORAGE_ADDR: 10.0.3.1:8040
138138
STORAGE_DIR: /home/user/.juju/local/storage
139-
stateservercert: '-----BEGIN CERTIFICATE-----
139+
controllercert: '-----BEGIN CERTIFICATE-----
140140
141141
MIICNzCCAaKgAwIBAgIBADALBgkqhkiG9w0BAQUwQzENMAsGA1UEChMEanVqdTEy
142142
@@ -165,7 +165,7 @@ stateservercert: '-----BEGIN CERTIFICATE-----
165165
-----END CERTIFICATE-----
166166
167167
'
168-
stateserverkey: '-----BEGIN RSA PRIVATE KEY-----
168+
controllerkey: '-----BEGIN RSA PRIVATE KEY-----
169169
170170
MIICXAIBAAKBgQDJnbuNL3m/oY7Er2lEF6ye1SodepvpI0CLCdLwrYP52cRxbVzo
171171

‎api/backups/restore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ func finishAttempt(client *Client, closer closerFunc) (error, error) {
151151
}
152152

153153
// finishRestore since Restore call will end up with a reset
154-
// state server, finish restore will check that the the newly
155-
// placed state server has the mark of restore complete.
154+
// controller, finish restore will check that the the newly
155+
// placed controller has the mark of restore complete.
156156
// upstart should have restarted the api server so we reconnect.
157157
func finishRestore(newClient ClientConnection) error {
158158
var err, remoteError error

‎api/controller/controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ func (s *controllerSuite) TestDestroyController(c *gc.C) {
8282
}
8383

8484
func (s *controllerSuite) TestListBlockedModels(c *gc.C) {
85-
err := s.State.SwitchBlockOn(state.ChangeBlock, "change block for state server")
86-
err = s.State.SwitchBlockOn(state.DestroyBlock, "destroy block for state server")
85+
err := s.State.SwitchBlockOn(state.ChangeBlock, "change block for controller")
86+
err = s.State.SwitchBlockOn(state.DestroyBlock, "destroy block for controller")
8787
c.Assert(err, jc.ErrorIsNil)
8888

8989
sysManager := s.OpenAPI(c)

0 commit comments

Comments
 (0)