~plumgrid-team/charms/bundles/plumgrid-ons/single-controller

« back to all changes in this revision

Viewing changes to bundle.yaml

  • Committer: Charles Butler
  • Date: 2015-09-21 15:47:04 UTC
  • Revision ID: chuck@dasroot.net-20150921154704-tgcz2woko15ds0i9
 Adjusted charm paths for openstack/next charms, and added missing revisions to satisfy proof

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
        "gui-y": "0"
80
80
      to: 'lxc:plumgrid-director=0'
81
81
    nova-cloud-controller:
82
 
      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
 
82
      charm: cs:~openstack-charmers-next/trusty/nova-cloud-controller-1
83
83
      num_units: 1
84
84
      options:
85
85
        console-access-protocol: novnc
118
118
        "gui-y": "-250"
119
119
      to: 'lxc:plumgrid-director=0'
120
120
    neutron-api:
121
 
      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
 
121
      charm: cs:~openstack-charmers-next/trusty/neutron-api-1
122
122
      num_units: 1
123
123
      options:
124
124
        neutron-plugin: plumgrid
132
132
        "gui-y": "0"
133
133
      to: 'lxc:plumgrid-director=0'
134
134
    neutron-api-plumgrid:
135
 
      charm: cs:trusty/neutron-api-plumgrid
 
135
      charm: cs:trusty/neutron-api-plumgrid-1
136
136
      options:
137
137
        enable-metadata: True
138
138
      annotations:
139
139
        "gui-x": "750"
140
140
        "gui-y": "250"
141
141
    plumgrid-director:
142
 
      charm: cs:trusty/plumgrid-director
 
142
      charm: cs:trusty/plumgrid-director-1
143
143
      num_units: 1
144
144
      options:
145
145
        plumgrid-virtual-ip: 192.168.100.250
147
147
        "gui-x": "0"
148
148
        "gui-y": "500"
149
149
    nova-compute:
150
 
      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
 
150
      charm: cs:~openstack-charmers-next/trusty/nova-compute-1
151
151
      num_units: 1
152
152
      options:
153
153
        enable-live-migration: true
160
160
        "gui-y": "250"
161
161
      to: '0'
162
162
    plumgrid-edge:
163
 
      charm: cs:trusty/plumgrid-edge
 
163
      charm: cs:trusty/plumgrid-edge-0
164
164
      annotations:
165
165
        "gui-x": "500"
166
166
        "gui-y": "500"
167
167
    plumgrid-gateway:
168
 
      charm: cs:trusty/plumgrid-gateway
 
168
      charm: cs:trusty/plumgrid-gateway-1
169
169
      num_units: 1
170
170
      annotations:
171
171
        "gui-x": "-500"