state: deprecate JobManageState

state/address.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package state
 
 import (
         "fmt"
 
         "launchpad.net/juju-core/instance"
 )
@@ skipping 44 matching lines @@
 }
 
 // stateServerAddresses returns the list of internal addresses of the state
 // server machines.
 func (st *State) stateServerAddresses() ([]string, error) {
         type addressMachine struct {
                 Addresses []address
         }
         var allAddresses []addressMachine
         // TODO(rog) 2013/10/14 index machines on jobs.
-        err := st.machines.Find(D{{"jobs", JobManageState}}).All(&allAddresses)
+        err := st.machines.Find(D{{"jobs", JobManageEnviron}}).All(&allAddresses)
         if err != nil {
                 return nil, err
         }
         if len(allAddresses) == 0 {
                 return nil, fmt.Errorf("no state server machines found")
         }
         apiAddrs := make([]string, 0, len(allAddresses))
         for _, addrs := range allAddresses {
                 instAddrs := addressesToInstanceAddresses(addrs.Addresses)
                 addr := instance.SelectInternalAddress(instAddrs, false)
@@ skipping 59 matching lines @@
         config, err := st.EnvironConfig()
         if err != nil {
                 return nil, err
         }
         return &DeployerConnectionValues{
                 StateAddresses: appendPort(addrs, config.StatePort()),
                 APIAddresses:   appendPort(addrs, config.APIPort()),
                 SyslogPort:     config.SyslogPort(),
         }, nil
 }