Merge lp:~pwlars/charms/trusty/snappy-proposed-selftest-agent/rename-snappy-proposed-selftest-agent-charm into lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-selftest-agent/trunk

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 5
Merged at revision: 3
Proposed branch: lp:~pwlars/charms/trusty/snappy-proposed-selftest-agent/rename-snappy-proposed-selftest-agent-charm
Merge into: lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-selftest-agent/trunk
Diff against target: 110 lines (+12/-15)
6 files modified
README (+3/-5)
config.yaml (+1/-1)
hooks/actions.py (+1/-1)
hooks/services.py (+2/-2)
metadata.yaml (+2/-3)
templates/upstart.conf (+3/-3)
To merge this branch: bzr merge lp:~pwlars/charms/trusty/snappy-proposed-selftest-agent/rename-snappy-proposed-selftest-agent-charm
Reviewer Review Type Date Requested Status
Joe Talbott (community) Approve
Paul Larson Needs Resubmitting
Review via email: mp+260301@code.launchpad.net

Commit message

Rename charm to use snappy-proposed-selftest-agent

Description of the change

Rename charm to use snappy-proposed-selftest-agent

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

Looks good to me except for a couple of places where it looks like vim messed up the indentation. Pre-approving assuming you fix those.

review: Approve
4. By Paul Larson

fix whitespace issue

Revision history for this message
Paul Larson (pwlars) wrote :

Fixed

review: Needs Resubmitting
Revision history for this message
Joe Talbott (joetalbott) wrote :

One more.

5. By Paul Larson

one more ws fix

Revision history for this message
Paul Larson (pwlars) wrote :

fixed

review: Needs Resubmitting
Revision history for this message
Joe Talbott (joetalbott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2015-05-27 01:41:42 +0000
3+++ README 2015-05-27 15:42:21 +0000
4@@ -1,7 +1,7 @@
5 Overview
6 --------
7
8-This charm installs the core-selftest-agent service.
9+This charm installs the snappy-proposed-selftest-agent service.
10
11 Configuration
12 -------------
13@@ -9,8 +9,6 @@
14 There is only one config option for this charm:
15
16 * config-file: A base64 encoded string with the config file to use for
17- core-selftest-agent.
18+ snappy-proposed-selftest-agent.
19
20-The charm expects the payload code to be provided as
21-files/core-selftest-agent.tgz (a snapshot of lp:core-selftest-agent) along
22-with its corresponding files/pip-cache directory (python dependencies).
23+The charm expects the payload code to be provided as files/snappy-proposed-selftest-agent.tgz (a snapshot of lp:snappy-proposed-selftest-agent) along with its corresponding files/pip-cache directory (python dependencies).
24
25=== modified file 'config.yaml'
26--- config.yaml 2015-05-27 01:41:42 +0000
27+++ config.yaml 2015-05-27 15:42:21 +0000
28@@ -7,5 +7,5 @@
29 config-file:
30 type: string
31 description: |
32- base64 encoded string with the config file for core-selftest-agent
33+ base64 encoded string with the config file for snappy-proposed-selftest-agent
34
35
36=== modified file 'hooks/actions.py'
37--- hooks/actions.py 2015-05-27 01:41:42 +0000
38+++ hooks/actions.py 2015-05-27 15:42:21 +0000
39@@ -7,7 +7,7 @@
40 from charmhelpers.core.host import adduser
41 from charmhelpers.payload import (archive, execd)
42
43-SERVICE_NAME = 'core-selftest-agent'
44+SERVICE_NAME = 'snappy-proposed-selftest-agent'
45 SERVICE_CONFIGNAME = 'core-service.conf'
46 REQUIRED_PACKAGES = [
47 'python-virtualenv', 'python3-dev',
48
49=== modified file 'hooks/services.py'
50--- hooks/services.py 2015-05-27 01:41:42 +0000
51+++ hooks/services.py 2015-05-27 15:42:21 +0000
52@@ -11,7 +11,7 @@
53 config = hookenv.config()
54 manager = ServiceManager([
55 {
56- 'service': 'core-selftest-agent',
57+ 'service': 'snappy-proposed-selftest-agent',
58 'required_data': [config],
59 'data_ready': [
60 actions.basenode,
61@@ -22,7 +22,7 @@
62 actions.create_user,
63 helpers.render_template(
64 source='upstart.conf',
65- target='/etc/init/core-selftest-agent.conf'),
66+ target='/etc/init/snappy-proposed-selftest-agent.conf'),
67 actions.log_start,
68 ],
69 },
70
71=== modified file 'metadata.yaml'
72--- metadata.yaml 2015-05-27 01:41:42 +0000
73+++ metadata.yaml 2015-05-27 15:42:21 +0000
74@@ -1,8 +1,7 @@
75-name: core-selftest-agent
76+name: snappy-proposed-selftest-agent
77 summary: |
78 Deploy a service to request tests for new ubuntucore images via
79 rabbit queue.
80 maintainer: Canonical CI Engineering <canonical-ci-engineering@lists.launchpad.net>
81 description: |
82- Runs core-selftest-agent service from a given service tarball (provided as
83- files/core-selftest-agent.tgz).
84+ Runs snappy-proposed-selftest-agent service from a given service tarball (provided as files/snappy-proposed-selftest-agent.tgz).
85
86=== modified file 'templates/upstart.conf'
87--- templates/upstart.conf 2015-05-27 01:41:42 +0000
88+++ templates/upstart.conf 2015-05-27 15:42:21 +0000
89@@ -1,4 +1,4 @@
90-description "Starts a core-selftest-agent process"
91+description "Starts a snappy-proposed-selftest-agent process"
92
93 start on (local-filesystems and net-device-up IFACE=eth0)
94 stop on runlevel [!12345]
95@@ -11,13 +11,13 @@
96 # unless it fails 15 times within 5 seconds
97 respawn limit 15 5
98
99-env SERVICE_DIR=/srv/{{ environment }}/core-selftest-agent
100+env SERVICE_DIR=/srv/{{ environment }}/snappy-proposed-selftest-agent
101 env SERVICE_USER=core-worker
102
103 script
104
105 install -d -o ${SERVICE_USER} ${SERVICE_DIR}/logs
106 chdir ${SERVICE_DIR}
107- exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 core-selftest-agent.py -c ${SERVICE_DIR}/core-service.conf >> logs/core-selftest-agent.log 2>&1"
108+ exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 snappy-proposed-selftest-agent.py -c ${SERVICE_DIR}/core-service.conf >> logs/snappy-proposed-selftest-agent.log 2>&1"
109
110 end script

Subscribers

People subscribed via source and target branches