Merge lp://staging/~pwlars/core-selftest-agent/agent-config into lp://staging/core-selftest-agent

A have a couple of inline comments. I think we're now safe to remove the modified hostname methods.

Actually, I don't know that I'll even need a retry queue so I took it out for now. It may be necessary to retry internally for a failed manifest download or something, but I don't think this service has a concept of an infrastructure failure outside of its control that would require requeueing. I also replaced the hostname bit with socket.gethostname()

I'm happy with this. As mentioned over IRC, there really is no reason for the agent to retry messages. The input is a fan-out exchange so every consumer will already have a copy, no need to throw it back to see if another consumer can make use of it. I also doubt we'll need deadletter, but am happy to wait and see on this.

I'm curious as to why you kept ".replace('-machine', '')" on the hostname. I don't think this is hurting anything. But I'm not going to block on this either.

The attempt to merge lp:~pwlars/core-selftest-agent/agent-config into lp:core-selftest-agent failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-core-selftest-agentwtd8oky_/bin/python3
Also creating executable in /tmp/venv-core-selftest-agentwtd8oky_/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 1))
Cleaning up...
Exception:
Traceback (most recent call last):
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/basecommand.py", line 122, in main
    status = self.run(options, args)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/commands/install.py", line 278, in run
    requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/req.py", line 1177, in prepare_files
    url = finder.find_requirement(req_to_install, upgrade=self.upgrade)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/index.py", line 252, in find_requirement
    for page in self._get_pages(locations, req):
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/index.py", line 387, in _get_pages
    page = self._get_page(location, req)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/index.py", line 568, in _get_page
    session=self.session,
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/index.py", line 670, in get_page
    resp = session.get(url, headers={"Accept": "text/html"})
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/_vendor/requests/sessions.py", line 395, in get
    return self.request('GET', url, **kwargs)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/download.py", line 237, in request
    return super(PipSession, self).request(method, url, *args, **kwargs)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/_vendor/requests/sessions.py", line 349, in request
    prep = self.prepare_request(req)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/_vendor/requests/sessions.py", line 287, in prepare_request
    hooks=merge_hooks(request.hooks, self.hooks),
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/_vendor/requests/models.py", line 287, in prepare
    self.prepare_url(url, params)
  File "/tmp/venv-core-selftest-agentwtd8oky_/lib/python3.4/site-packages/pip/_vendor/requests/models.py", line 338, in prepare_url
    "Perhaps you meant http://{0}?".format(url))
pip._vendor.requests.exceptions.MissingSchema: Invalid URL '/tmp/tmpgxqm1lttpip-cache-/cache': No schema supplied. Perhaps you meant http:///tmp/tmpgxqm1lttpip-cache-/cache?

Storing debug log for failure in /home/tarmac/.pip/pip.log
INFO: Executing: virtualenv -p python3 /tmp/venv-core-selftest-agentwtd8oky_
INFO: Executing: /tmp/venv-core-selftest-agentwtd8...

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

I see core-service.conf and SOLUTION_NAME=core-image-testing as potentially confusing but could notice some other services in the same solution are using this.

Yeah, that's just a placeholder for now. A lot of that is going to need to change.