← Back to branch summary

~corey.bryant/openstack-charm-testing/neutron-for-nova

« back to all changes in this revision

Viewing changes to bundles/ppc64/powerkvm-three-unit-method1.yaml

  • Committer: Ryan Beisner
  • Date: 2015-03-05 01:59:39 UTC
  • Revision ID: ryan.beisner@canonical.com-20150305015939-jfr9whclx318aehc
revert already-merged kilo-support branches in bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bundles/ppc64/powerkvm-three-unit-method1.yaml
33
33
      to:
34
34
        - "lxc:0"
35
35
    keystone:
36
 
#      branch: lp:~openstack-charmers/charms/trusty/keystone/next
37
 
      branch: lp:~1chb1n/charms/trusty/keystone/kilo-support
 
36
      branch: lp:~openstack-charmers/charms/trusty/keystone/next
38
37
      num_units: 1
39
38
      options:
40
39
        "admin-password": openstack
44
43
      to:
45
44
        - "lxc:nova-compute-power=0"
46
45
    neutron-gateway:
47
 
#      branch: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
48
 
      branch: lp:~james-page/charms/trusty/quantum-gateway/kilo-support
 
46
      branch: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
49
47
      num_units: 1
50
48
      options:
51
49
        "ext-port": eth1
55
53
      to:
56
54
        - "0"
57
55
    neutron-api:
58
 
#      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
59
 
      branch: lp:~james-page/charms/trusty/neutron-api/kilo-support
 
56
      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
60
57
      num_units: 1
61
58
      options:
62
59
        "neutron-security-groups": true
72
69
        "gui-x": "250"
73
70
        "gui-y": "500"
74
71
    mysql:
75
 
#      branch: lp:charms/trusty/mysql
76
 
      branch: lp:~james-page/charms/trusty/mysql/kilo-support
 
72
      branch: lp:charms/trusty/mysql
77
73
      num_units: 1
78
74
      options:
79
75
        "max-connections": 20000
94
90
# /!\ Temporary AMD64 substitute for bundle validation:
95
91
    nova-compute-power:
96
92
#    nova-compute:
97
 
#      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
98
 
      branch: lp:~james-page/charms/trusty/nova-compute/kilo-support
 
93
      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
99
94
      num_units: 1
100
95
      constraints: arch=amd64 mem=8G
101
96
      options:
115
110
      to:
116
111
        - "lxc:nova-compute-power=0"
117
112
    nova-cloud-controller:
118
 
#      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
119
 
      branch: lp:~james-page/charms/trusty/nova-cloud-controller/kilo-support
 
113
      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
120
114
      num_units: 1
121
115
      options:
122
116
        "network-manager": Neutron
135
129
      to:
136
130
        - "lxc:0"
137
131
    rabbitmq-server:
138
 
#      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
139
 
      branch: lp:~james-page/charms/trusty/rabbitmq-server/kilo-support
 
132
      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
140
133
      num_units: 1
141
134
      annotations:
142
135
        "gui-x": "500"
267
260
      to:
268
261
        - "lxc:0"
269
262
    mongodb:
270
 
#      branch: lp:charms/trusty/mongodb
271
 
      branch: lp:~james-page/charms/trusty/mongodb/kilo-support
 
263
      branch: lp:charms/trusty/mongodb
272
264
      annotations:
273
265
        "gui-x": "1000"
274
266
        "gui-y": "750"