Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
worker/caasoperator: tidy up, add tests #8134
Conversation
| for { | ||
| select { | ||
| case <-timeout: | ||
| c.Fatalf("no activity detected") | ||
| case <-time.After(coretesting.ShortWait): | ||
| - link := filepath.Join(agentDir, commands.CommandNames()[0]) | ||
| + agentBinaryDir := agenttools.ToolsDir(dataDir, "application-"+applicationName) |
wallyworld
Nov 27, 2017
Owner
The jujud operator binary doesn't live in a directory named after the application - it is baked into the operator docker image in /usr/bin or somewhere. That's why manifold config had an AgentDir config attribute and was set to os.Args[0]
axw
Nov 27, 2017
Member
I see. Updated to look in /var/lib/juju/tools, and added a comment on Config.DataDir.
|
$$merge$$ |
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
|
Build failed: Tests failed |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
|
Build failed: Tests failed |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
axw commentedNov 27, 2017
Removed some bits we can infer, and other things that aren't currently required, and may not be later. Pass Clock in via manifold inputs.