Merge lp:~caio1982/capomastro/charm-from-pes-to-os into lp:~ubuntuone-hackers/capomastro/charm

[Caio Begotti]

Update some of the mentions (if not all :-]) to the old PES team, to reflect the changes needed to put Capomastro under the OS umbrella. The spec will also be updated in a different MR.

Update some of the mentions (if not all :-]) to the old PES team, to reflect the changes needed to put Capomastro under the OS umbrella. The spec will also be updated in a different MR.

The repository still need to be set up accordingly by IS as they have permission to change owners directly, we don't.

[Daniel Manrique (roadmr)]

+1, my only comment is whether we need a replacement for this line which was removed:

export t_nagios_project="PES"

but we could fix it later if it gives trouble.

review: Approve

[Caio Begotti (caio1982)]

Nope, that was just extra info used in the description of the check.

On Tue, Sep 29, 2015 at 10:20 AM, Daniel Manrique <
<email address hidden>> wrote:

> Review: Approve
>
> +1, my only comment is whether we need a replacement for this line which
> was removed:
>
> export t_nagios_project="PES"
>
> but we could fix it later if it gives trouble.
> --
>
> https://code.launchpad.net/~caio1982/capomastro/charm-from-pes-to-os/+merge/272236
> You are the owner of lp:~caio1982/capomastro/charm-from-pes-to-os.
>

=== modified file 'README'
--- README	2014-11-06 16:21:43 +0000
+++ README	2015-09-24 12:59:08 +0000
@@ -13,7 +13,7 @@
 
 * Trusty 14.04, as it's the minimal supported version
 * Access to lp:bygmester (ideally, not absolutely required though)
-* Access to the PES CE's PPA ppa:ce-infrastructure/capomastro
+* Access to the repository ppa:ubuntuone-hackers/capomastro
 
 Grabbing charms
 ---------------
@@ -22,7 +22,7 @@
 $ mkdir -p charms/trusty; cd charms/trusty
 
 Check out Capomastro's charm:
-$ bzr branch lp:~ce-infrastructure/capomastro/charm capomastro
+$ bzr branch lp:~ubuntuone-hackers/capomastro/charm capomastro
 
 Modified Jenkins' charm now:
 $ bzr branch lp:~caio1982/charms/trusty/jenkins-ce-charm/trunk jenkins
@@ -38,7 +38,7 @@
 manual tweaking as adding private PPAs via apt-add-repository is not support yet. So
 please edit and do it manually in the hooks/install script.
 
-$ apt-add-repository ppa:ce-infrastructure/capomastro
+$ apt-add-repository ppa:ubuntuone-hackers/capomastro
 
 If you need to change/add SSH keypairs or different jobs, put them inside the files dir, like
 the following example tree. Inside the jobs dir you'd put the checkouts of all jobs types

=== modified file 'config.yaml'
--- config.yaml	2015-04-06 12:38:33 +0000
+++ config.yaml	2015-09-24 12:59:08 +0000
@@ -57,7 +57,7 @@
     description: "The superuser e-mail address for eventual notifications"
   repository:
     type: string
-    default: "ppa:ce-infrastructure/capomastro"
+    default: "ppa:ubuntuone-hackers/capomastro"
     description: "The PPA address or private repository line for apt-add-repository"
   nagios_context:
     default: "juju"

=== modified file 'files/download-supported-job-types'
--- files/download-supported-job-types	2014-10-30 17:14:41 +0000
+++ files/download-supported-job-types	2015-09-24 12:59:08 +0000
@@ -2,7 +2,7 @@
 
 _TREE="bygmester/jobs"
 _TYPES="rootfs tarball image-puller android-barajas android"
-_PROJ="~ce-infrastructure/bygmester"
+_PROJ="~ubuntuone-hackers/bygmester"
 
 mkdir -p ${_TREE}
 pushd ${_TREE} > /dev/null

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2015-02-19 00:59:50 +0000
+++ hooks/nrpe-external-master-relation-changed	2015-09-24 12:59:08 +0000
@@ -12,7 +12,6 @@
 	# that possibly no one would need to change, hence we'll
 	# have a less cluttered config.yaml file
 	export t_nagios_context="$(config-get nagios_context)"
-	export t_nagios_project="PES"
 	export t_nagios_servicegroup="$t_nagios_context"
 	export t_nagios_hostname="${t_nagios_context}-${unit_name//\//-}"
 

=== modified file 'templates/nrpe_service_file.tmpl'
--- templates/nrpe_service_file.tmpl	2015-02-19 00:59:50 +0000
+++ templates/nrpe_service_file.tmpl	2015-09-24 12:59:08 +0000
@@ -2,7 +2,7 @@
 define service {
     use                             active-service
     host_name                       ${t_nagios_hostname}
-    service_description             ${t_nagios_hostname} ${t_nagios_project} ${t_nagios_context} ${t_nagios_service_description}
+    service_description             ${t_nagios_hostname} ${t_nagios_context} ${t_nagios_service_description}
     check_command                   check_nrpe!${t_nagios_command_name}
     servicegroups                   ${t_nagios_servicegroup},
 }