Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/restish-pgsql into lp://qastaging/uci-engine

  1. restish-pgsql
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 571
Merged at revision: 572
Proposed branch: lp://qastaging/~doanac/uci-engine/restish-pgsql
Merge into: lp://qastaging/uci-engine
Diff against target: 147 lines (+65/-14)
3 files modified
charms/precise/restish/hooks/hooks.py (+37/-14)
charms/precise/restish/metadata.yaml (+3/-0)
charms/precise/restish/unit_tests/test_hooks.py (+25/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/restish-pgsql
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+222963@code.qastaging.launchpad.net

Commit message

restish charm: support pgsql relations

This allows the restish charm to pair up with a postgres server. It
stores the DB settings as a json file like:

 {
   "database": "ci-airline-gatekeeper-restish",
   "schema_user": "db_2_ci_airline_gatekeeper_restish_schema",
   "schema_password": "mGHMMdLp5hWwb9nqW7whwCttHhCWfLP3Cm9Y62b3",
   "host": "10.0.3.169",
   "user": "db_2_ci_airline_gatekeeper_restish",
   "password": "mLL8s7dsZ82sPdzyV5dyYwSrwCRcrcPffdbfNSmfXg",
   "port": "5432"
 }

Description of the change

needed for the non-function testing stuff

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:571
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/844/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/844/rebuild

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

Looks good, as long as the pgsql.json is the format expected by clients.

I have one minor remark, to avoid confusion I'd call the charm interface pgsql.json (not sure dots are allowed, if they are not, pgsql_json).

But that's your call.

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 06/12/2014 01:49 PM, Celso Providelo wrote:
> I have one minor remark, to avoid confusion I'd call the charm interface pgsql.json (not sure dots are allowed, if they are not, pgsql_json).

its required to be pgsql by the postgres charm.

Revision history for this message
Celso Providelo (cprov) wrote :

Right, right .. I haven't thought about the implications.

LGTM!

On Thu, Jun 12, 2014 at 3:57 PM, Andy Doan <email address hidden> wrote:
> On 06/12/2014 01:49 PM, Celso Providelo wrote:
>> I have one minor remark, to avoid confusion I'd call the charm interface pgsql.json (not sure dots are allowed, if they are not, pgsql_json).
>
> its required to be pgsql by the postgres charm.
>
> --
> https://code.launchpad.net/~doanac/uci-engine/restish-pgsql/+merge/222963
> You are reviewing the proposed merge of lp:~doanac/uci-engine/restish-pgsql into lp:uci-engine.

--
Celso Providelo
<email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches