← Back to branch summary

~psivaa/uci-engine/rabbitmq-restish-with-proxy

« back to all changes in this revision

Viewing changes to juju-deployer/lander.yaml

  • Committer: Joe Talbott
  • Date: 2014-01-27 14:54:08 UTC
  • mfrom: (126.3.8 webui)
  • mto: This revision was merged to the branch mainline in revision 161.
  • Revision ID: joe.talbott@canonical.com-20140127145408-zpubebx02y6oumxq
merge doanac's cleanup branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju-deployer/lander.yaml
14
14
            branch: lp:charms/precise/gunicorn
15
15
            options:
16
16
                wsgi_wsgi_file: lander.wsgi:app
17
 
        jenkins:
 
17
        lander-jenkins:
18
18
            charm: jenkins
19
19
            branch: lp:~ci-engineering-private/charms/precise/jenkins/ci-train
20
20
            constraints: "cpu-cores=2 mem=8 root-disk=8192M"
24
24
                tools: bzr
25
25
                username: admin
26
26
                password: admin
27
 
        lander-jenkins:
 
27
        lander-jenkins-sub:
28
28
            charm: lander-jenkins
29
29
            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/lander
30
30
            options:
35
35
                packages: "python-amqplib python-swiftclient"
36
36
                plugins: "parameterized-trigger:2.14"
37
37
    relations:
38
 
        - [jenkins, lander-jenkins]
 
38
        - [lander-jenkins, lander-jenkins-sub]
39
39
        - [lander-restish, lander-gunicorn]
40
 
        - [lander-restish, lander-jenkins]
 
40
        - [lander-restish, lander-jenkins-sub]