~themue/juju-core/053-env-more-script-friendly : changes

~themue/juju-core/053-env-more-script-friendly » Changes from revision 1489.1.2

From Revision 1489.1.2 to 1472

Rev	Summary	Authors	Date
1489.1.2	Address review comments from dimitern and thumper Address review comments from dimitern and thumper	Martin Packman	10 years ago
1489.1.1	Switch state address struct into instance with mapping to st... Switch state address struct into instance with mapping to state equivalent	Martin Packman	10 years ago
1489	[r=rogpeppe] worker/uniter/charm: fix temp dir [r=rogpeppe] worker/uniter/charm: fix temp dir Fixes https://bugs.launchpad.net/juju-core/+bug/1197369 . I'm not sure whether the time stamp is actually necessary, so I've left it as designed. It seems that the directory is never actually removed, so that's probably a reasonable rationale for that. https://codereview.appspot.com/11290043/	Roger Peppe	10 years ago
1488	[r=gz] Add state/address.go for machine location data [r=gz] Add state/address.go for machine location data Add data structure for describing machine addresses. This is the first step towards deprecating PublicAddress and PrivateAddress in unitDoc and storing a list of addresses in machineDoc instead. The structure uses a single field that may contain either a hostname or an address. The plan is for a New constructor to correctly flag the type of location. https://codereview.appspot.com/11284044/ R=fwereade, jameinel	Martin Packman	10 years ago
1487	[r=thumper] Add the autostart symlink for containers. [r=thumper] Add the autostart symlink for containers. In order for containers to autostart, there needs to be a symlink in /etc/lxc/auto called CN.conf where CN is the container name, which points to the config file for the container, which is by default /var/lib/lxc/CN/config. https://codereview.appspot.com/11491043/	Tim Penhey	10 years ago
1486	[r=thumper] Clean up the code a bit with “make simplify”. [r=thumper] Clean up the code a bit with “make simplify”. We should do this regularly. In this case, it only made one tiny change.	jtv at canonical	10 years ago
1485	[r=thumper] Add the admin-secret to the local boilerplate. [r=thumper] Add the admin-secret to the local boilerplate. Was missed in the first pass. https://codereview.appspot.com/11455044/	Tim Penhey	10 years ago
1484	[r=thumper] Update the container tests to use gc prefix. [r=thumper] Update the container tests to use gc prefix. Only import name changes, nothing else. https://codereview.appspot.com/11450046/	Tim Penhey	10 years ago
1483	[r=wallyworld] The bootstrap node now knows its hardware [r=wallyworld] The bootstrap node now knows its hardware It turns out that the solution used here is similar to what was done in pyjuju. On bootstrapping, we currently write out a provider-state file with the bootstrap instance id. This is now augmented to include the hardware charactistics of the bootstrap node. The bootstrap nodes reads these when it starts. An implication is that the InstanceId() method on the provider is no longer required. This was a bit of a hack anyway and I doubt many will mourn it's loss. https://codereview.appspot.com/11318043/	Ian Booth	10 years ago
1482	[r=thumper],[bug=1202382] Increase timeout for local provide... [r=thumper],[bug=1202382] Increase timeout for local provider bootstrap sequence	Marco Ceppi	10 years ago
1481	[r=jtv] Unify providers' user-data composition functions. [r=jtv] Unify providers' user-data composition functions. All the "physical" providers (EC2, OpenStack, MAAS, Azure) were generating user data in essentially the same way. The MAAS one looked different but actually just added an optional bit that was still completely generic. And so this branch unifies the implementations. Construction of the cloudinit.MachineConfig was lifted out of the function. That may seem arbitrary, but it's part of a greater plan: in a later step of the ongoing refactoring the construction can be lifted out of the providers' internalStartInstance methods as well, doing away with the EC2 and OpenStack providers' startInstanceParams structs. This actually shortens some of the data flows and reduces cognitive load, which can only be good for maintenance. After that step we can have a fresh look at sanitizing NewMachineConfig (which arguably should take more parameters, or not exist at all, but is in an intermediate state that facilitates the changes happening now). We may also look into re-introducing some sort of dedicated Parameter Object for internalStartInstance, but by then the cluster of methods Bootstrap / StartInstance / internalStartInstance will look a bit different and we can find the most maintainable solution for that new situation.	jtv at canonical	10 years ago
1480	[r=jameinel],[bug=1199915] cmd/jujud: Ensure valid agent.con... [r=jameinel],[bug=1199915] cmd/jujud: Ensure valid agent.conf after upgrade This fixes the agent.conf files for the machine and unit agents after upgrading from 1.10 to 1.11. I ran into a few differences, the basics are: 1) Machine Agent: machine 0 always starts the state worker, when upgrading it has an APIInfo section, but it 1a) Didn't have Machine.SetPassword in the DB set so we didn't have a way to connect via the api 1b) Didn't have a password set in apiinfo, and 1.10 had already changed the password after connecting to the MongoDB 1c) Had changed their password already So to solve this one, we grab the Password from StateInfo.Password, call Agent.SetPassword(), and set the value in APIInfo.Password. 2) Machine Agent: machine != 0. Were only connecting to the state after connecting to the API. Because of (1a,b) they couldn't connect to notice that they had work to do. So on top of what we did for (1), I added a step of: 2a) If we are unable to connect to the API, call ensureStateWorker(). This gives us an opportunity to set our API password and save it in agent.conf. 3) Unit agents: 3a) Didn't even have an APIInfo section. 3b) Did have a Mongo password, and had reset their Mongo Password So we copy the state info into the api info section, and change the port. I only use the default port (17070). I think it would be possible to query something in state for what the official API is (state.State.Environ().APIInfo() comes to mind, but I'm not sure what the correct value is.) I felt that changing the port would solve all current 1.10 users, and if we change things in the future, we can change the code. (I also just discovered that we have Conf.APIPort which may or may not be set in all the various permutations, I don't have the energy to track down 3 different versions now.) 4) Unit agents bootstrapped with 1.11.2 tools 4a) Would have a valid APIInfo section 4b) But would not have StateInfo.Password or APIInfo.Password set. This is because changing the Password now occurs when we connect to the API, not when we first connect to the Mongo DB. I added checks for this, to make sure that 1.11.3 doesn't cause us to call Unit.SetPassword(""). I did a few upgrades from 1.10 => this code, and 1.11.2 => this code, and straight bootstrapping from this code. It all seems to be up and running. I don't think I tried bootstrapping 1.10 with this code and upgrading. I hopefully captured all of these config edge cases in the test suite, so we don't have to test all the permutations manually in the future. We also need to think very carefully when we add stuff about how we will get upgrade to notice. I'm starting to think we want to tweak how upgrade works. So instead of just replacing the tools, it has a "juju upgraded" or some other command that runs the first time you are upgraded so we can put logic into that place and have it centralized. https://codereview.appspot.com/11137044/	John Arbash Meinel	10 years ago
1479	[r=gz] Check correct info attr in cloudinit.apiHostAddrs [r=gz] Check correct info attr in cloudinit.apiHostAddrs Fixes a copy/paste error in cloudinit.MachineConfig to agent.Conf conversion helper function. No test as the only codepath that uses this goes through verifyConfig which already asserts both StateInfo and APIInfo are not nil, so not possible to write a failing test using exposed functions.	Martin Packman	10 years ago
1478	[r=dimitern] state/api: Deployer client-side facade. [r=dimitern] state/api: Deployer client-side facade. Implemented all the necessary API calls for the deployer worker. This is the last step needed before the deployer can be refactored to use only the API to talk to state. Also fixed the StringsWatcher client implementation (I initially got it wrong, but since nobody was using it yet it got undetected). Few other minor issues discovered and fixed in state, adding tests as needed. https://codereview.appspot.com/11342043/ R=fwereade, themue	Dimiter Naydenov	10 years ago
1477	[r=jtv] Convert MAAS provider to loggo. [r=jtv] Convert MAAS provider to loggo. We've been told this was desired, so we might as well do it. Why keep the obsolete approach around to set a bad example?	jtv at canonical	10 years ago
1476	[r=thumper] Enable the local provider. [r=thumper] Enable the local provider. This branch changes how the local storage is handled. It really wasn't possible to have the client keep serving the storage on dynamic ports and expect other running services to work. Also we need something always acting as the storage. After discussion with William last night, we agreed that this should be a worker in the machine agent. https://codereview.appspot.com/11333043/	Tim Penhey	10 years ago
1475	[r=jtv] Fix for gwacl update. [r=jtv] Fix for gwacl update.	Gavin Panella	10 years ago
1474	[r=thumper] Conditionally install lxc [r=thumper] Conditionally install lxc There are two primary situations where we don't want the machine agent to install lxc: 1. when the machine agent is inside an lxc container as known by state 2. when the machine has been provisioned by the local provider (because it is an lxc container) When lxc is installed inside a container, it adds a bridge network device with the same defaults as the host. This kills any routing in or out of the container. Upstart provides support for setting environment variables as part of the config, and we use this to pass the provider type through. https://codereview.appspot.com/11330043/	Tim Penhey	10 years ago
1473	[r=thumper] Have the lxc manager log dir be configurable. [r=thumper] Have the lxc manager log dir be configurable. Since the local provider wants to store the log files in a different location, the ContainerManager needs to be configured with the location. The default log location is still the same, but is now able to be configured. Also factored out the function for getting the IPv4 address for a named interface. The containers have "eth0" as their network interface, so this is used to get the DNSName. https://codereview.appspot.com/11327044/	Tim Penhey	10 years ago
1472	[r=thumper] Machine agent for local provider bootstrap [r=thumper] Machine agent for local provider bootstrap If you are using a local provider, always upload tools. This uses the standard mechanism for getting tools into the local provider storage. From there the tools are unpacked the same way as an agent would normally do it, although we do cheat and go directly to the file on disk so we don't have to pretend to download it somewhere else. https://codereview.appspot.com/11327043/	Tim Penhey	10 years ago

Older »