Merge lp:~psivaa/core-image-publisher/use-payload-channel into lp:core-image-publisher

[Para Siva]

Reverting changes made in rev28, to not hardcode the channel and introducing release.

Reverting changes made in rev28, to not hardcode the channel and introducing release. Also some refactoring to make more use of constants.py.

NOTE: https://code.launchpad.net/~psivaa/core-image-watcher/channel-release-for-image-publisher/+merge/261065 should land first before landing this one.

[Paul Larson (pwlars)]

+1, I think this is dependent on https://code.launchpad.net/~psivaa/core-image-watcher/channel-release-for-image-publisher/+merge/261065 though

review: Approve

[Para Siva (psivaa)]

Thanks Paul. yes, that the image-watcher should land first before landing this particular one. Sorry I just added it in the MP.

[Francis Ginther (fginther)]

Looks good.

review: Approve

=== modified file 'core_image_publisher/__init__.py'
--- core_image_publisher/__init__.py	2015-04-08 20:14:12 +0000
+++ core_image_publisher/__init__.py	2015-06-04 09:29:56 +0000
@@ -70,11 +70,11 @@
             publisher = CoreImageResultPublisher(connection)
             retry_policy = DefaultRetryPolicy(
                 max_retries=3,
-                dead_queue='core.deadletters.{}'.format(constants.API_VERSION)
+                dead_queue=constants.DEAD_QUEUE
             )
             monitor = SimpleRabbitQueueWorker(
                 connection,
-                'core.image.{}'.format(constants.API_VERSION),
+                constants.INPUT_QUEUE,
                 worker.ImagePublisherWorker(config, publisher),
                 retry_policy,
             )

=== modified file 'core_image_publisher/constants.py'
--- core_image_publisher/constants.py	2015-04-01 01:19:12 +0000
+++ core_image_publisher/constants.py	2015-06-04 09:29:56 +0000
@@ -14,9 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """Constants for this service."""
 
+import socket
+
+
 API_VERSION = "v1"
 
 RETRY_COUNT = 3
@@ -25,27 +27,11 @@
 
 SERVICE_NAME = "core-image-publisher"
 
-
-def _get_hostname():
-    """Return sanitized contents of /etc/hostname.
-
-    It is necessary because current juju hostnames (juju-<env-name>-machine-#)
-    are too big due to our long environment names ('<spec_name>-<MD5>').
-    Linux (DNS for RFC1035, really) only supports labels up to 64 chars and
-    the fallback varies from tool to tool, `cloud-init` chokes on longer
-    names and sets 'ubuntu' (which is the value considered by socket.get*),
-    `hostnamectl` (systemd) would truncate the given data.
-
-    None of this is ideal to our applications, that's why we will operate
-    on the pristine /etc/hostname and remove the 'juju-' and '-machine' terms
-    added by juju.
-    """
-    with open('/etc/hostname') as fd:
-        hostname = fd.read()
-    return hostname.replace('juju-', '').replace('-machine', '').strip()
-
-
-HOSTNAME = _get_hostname()
+DEAD_QUEUE = "core.deadletters.{}".format(API_VERSION)
+
+INPUT_QUEUE = "core.image.{}".format(API_VERSION)
+
+HOSTNAME = socket.gethostname()
 
 LOGGING_EXTRA = {
     'solution': SOLUTION_NAME,

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-04-23 01:33:11 +0000
+++ core_image_publisher/worker.py	2015-06-04 09:29:56 +0000
@@ -46,6 +46,7 @@
         try:
             image_name = payload['image_name']
             channel = payload['channel']
+            release = payload['release']
             device = payload['device']
         except KeyError as e:
             logger.error(
@@ -61,6 +62,7 @@
             try:
                 image_path = download_image(
                     image_name,
+                    release,
                     channel,
                     device,
                     tmpdir
@@ -106,7 +108,7 @@
         return MessageActions.Acknowledge
 
 
-def download_image(name, channel, device, tmpdir):
+def download_image(name, release, channel, device, tmpdir):
     """Download the ubuntu code image, return a path to it on disk."""
     image_path = os.path.join(tmpdir, 'core-{}.img'.format(name))
     udf_env = {
@@ -122,12 +124,12 @@
            '--revision', name,
            'core',
            '--device', device,
-           '--channel', 'edge',
+           '--channel', channel,
            '--size', '3',
            '-o', image_path,
            '--developer-mode',
            '--cloud',
-           'rolling']
+           release]
     check_call(cmd, env=udf_env)
     cmd = ['sudo',
            'rm',