Merge lp:~1chb1n/openstack-mojo-specs/update-1604 into lp:openstack-mojo-specs
- update-1604
- Merge into mojo-openstack-specs
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 250 |
| Proposed branch: | lp:~1chb1n/openstack-mojo-specs/update-1604 |
| Merge into: | lp:openstack-mojo-specs |
| Diff against target: |
2191 lines (+1691/-52) 33 files modified
SPEC_SUMMARY.txt (+21/-21) helper/bundles/baremetal7-next.yaml (+328/-0) helper/bundles/baremetal7.yaml (+2/-0) helper/bundles/deprecated/ssl-everywhere.yaml (+4/-1) helper/bundles/full-dvr-next.yaml (+1/-2) helper/bundles/full-next.yaml (+277/-0) helper/bundles/full-ssl-next.yaml (+256/-0) helper/bundles/full-ssl.yaml (+3/-0) helper/bundles/full-vrrpha-next.yaml (+1/-1) helper/bundles/full.yaml (+4/-1) helper/bundles/ha-next.yaml (+0/-3) helper/bundles/ha.yaml (+272/-0) helper/bundles/haphase1-next.yaml (+1/-2) helper/bundles/haphase1.yaml (+216/-0) helper/bundles/haphase2-next.yaml (+1/-2) helper/bundles/haphase2.yaml (+269/-0) helper/bundles/ksv3-full-next.yaml (+0/-1) helper/bundles/minimal-next.yaml (+1/-2) helper/bundles/next-ha.yaml (+1/-2) helper/scripts/check-lint.sh (+20/-0) specs/dev/next_mini/mini.yaml (+1/-2) specs/full_stack/next_deploy_ssl/icehouse/manifest (+1/-1) specs/full_stack/next_deploy_ssl/kilo/manifest (+1/-1) specs/full_stack/next_deploy_ssl/liberty/manifest (+1/-1) specs/full_stack/next_dvr/kilo/manifest (+1/-1) specs/full_stack/next_dvr/liberty/manifest (+1/-1) specs/full_stack/next_dvr/mitaka/manifest (+1/-1) specs/full_stack/next_ha_vrrp/kilo/manifest (+1/-1) specs/full_stack/next_ha_vrrp/liberty/manifest (+1/-1) specs/full_stack/next_keystone_v3/liberty/manifest (+1/-1) specs/full_stack/stable_deploy_ssl/icehouse/manifest (+1/-1) specs/full_stack/stable_deploy_ssl/kilo/manifest (+1/-1) specs/full_stack/stable_deploy_ssl/liberty/manifest (+1/-1) |
| To merge this branch: | bzr merge lp:~1chb1n/openstack-mojo-specs/update-1604 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Update bundles and pointers for quantum-
This does not address the stable_to_next* (charm upgrade) specs -- which does need to be updated separately.
Make bundle names and spec names consistent and adjust linter.
To post a comment you must log in.
- 250. By Ryan Beisner
-
Additional next q-s-g cleanup
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote : | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2242 mojo-openstack-
LINT OK: passed
- 251. By Ryan Beisner
-
Update linter
- 252. By Ryan Beisner
-
Update summary
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2243 mojo-openstack-
LINT OK: passed
- 253. By Ryan Beisner
-
Update
- 254. By Ryan Beisner
-
Update ha oneshot next
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2244 mojo-openstack-
LINT OK: passed
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'SPEC_SUMMARY.txt' |
| 2 | --- SPEC_SUMMARY.txt 2016-04-08 13:41:18 +0000 |
| 3 | +++ SPEC_SUMMARY.txt 2016-04-12 03:41:29 +0000 |
| 4 | @@ -101,18 +101,6 @@ |
| 5 | This spec performs a non-ha deploy using the stable charms, then upgrades the |
| 6 | charms to the devel versions and then runs tests to validate the deployment |
| 7 | |
| 8 | -./specs/full_stack/next_ha_phased/icehouse/ |
| 9 | -This spec performs a phased ha deploy then runs tests to validate the |
| 10 | -deployment |
| 11 | - |
| 12 | -./specs/full_stack/next_ha_phased/kilo/ |
| 13 | -This spec performs a phased ha deploy then runs tests to validate the |
| 14 | -deployment |
| 15 | - |
| 16 | -./specs/full_stack/next_ha_phased/liberty/ |
| 17 | -This spec performs a phased ha deploy then runs tests to validate the |
| 18 | -deployment |
| 19 | - |
| 20 | ./specs/full_stack/next_ha_vrrp/kilo/ |
| 21 | This spec deploys and tests a deployment with neutron VRRP enabled, it then |
| 22 | takes down the gateways in turn and checks a guest remains accessible |
| 23 | @@ -286,15 +274,27 @@ |
| 24 | This spec collects the charms and then upgrades charmhelpers in each charm |
| 25 | before running a ha deployment and testing the resulting cloud |
| 26 | |
| 27 | -./specs/full_stack/next_ha_phased_chaos_pony/icehouse/ |
| 28 | -This spec performs a phased ha deploy then runs tests to validate the |
| 29 | -deployment. iThen chaos pony is used to add and remove units. |
| 30 | - |
| 31 | -./specs/full_stack/next_ha_phased_chaos_pony/kilo/ |
| 32 | -This spec performs a phased ha deploy then runs tests to validate the |
| 33 | -deployment. iThen chaos pony is used to add and remove units. |
| 34 | - |
| 35 | -./specs/full_stack/next_ha_phased_chaos_pony/liberty/ |
| 36 | +./specs/deprecated/next_ha_phased/icehouse/ |
| 37 | +This spec performs a phased ha deploy then runs tests to validate the |
| 38 | +deployment |
| 39 | + |
| 40 | +./specs/deprecated/next_ha_phased/kilo/ |
| 41 | +This spec performs a phased ha deploy then runs tests to validate the |
| 42 | +deployment |
| 43 | + |
| 44 | +./specs/deprecated/next_ha_phased/liberty/ |
| 45 | +This spec performs a phased ha deploy then runs tests to validate the |
| 46 | +deployment |
| 47 | + |
| 48 | +./specs/deprecated/next_ha_phased_chaos_pony/icehouse/ |
| 49 | +This spec performs a phased ha deploy then runs tests to validate the |
| 50 | +deployment. iThen chaos pony is used to add and remove units. |
| 51 | + |
| 52 | +./specs/deprecated/next_ha_phased_chaos_pony/kilo/ |
| 53 | +This spec performs a phased ha deploy then runs tests to validate the |
| 54 | +deployment. iThen chaos pony is used to add and remove units. |
| 55 | + |
| 56 | +./specs/deprecated/next_ha_phased_chaos_pony/liberty/ |
| 57 | This spec performs a phased ha deploy then runs tests to validate the |
| 58 | deployment. iThen chaos pony is used to add and remove units. |
| 59 | |
| 60 | |
| 61 | === added file 'helper/bundles/baremetal7-next.yaml' |
| 62 | --- helper/bundles/baremetal7-next.yaml 1970-01-01 00:00:00 +0000 |
| 63 | +++ helper/bundles/baremetal7-next.yaml 2016-04-12 03:41:29 +0000 |
| 64 | @@ -0,0 +1,328 @@ |
| 65 | +# vim: set ts=2 et: |
| 66 | +# |
| 67 | +# A 7-machine bare metal bundle which is appx. equivalent to "sparse/next.yaml" |
| 68 | +# with some smooshing and co-location for density. This is an EXAMPLE TEST BUNDLE. |
| 69 | +# |
| 70 | +# See example usage in README @ lp:openstack-charm-testing. |
| 71 | +# http://bazaar.launchpad.net/~ost-maintainers/openstack-charm-testing/trunk/view/head:/README |
| 72 | +# |
| 73 | +openstack-services: |
| 74 | + services: |
| 75 | + mysql: |
| 76 | + charm: mysql |
| 77 | + options: |
| 78 | + dataset-size: 50% |
| 79 | + to: |
| 80 | + - "0" |
| 81 | + rabbitmq-server: |
| 82 | + charm: rabbitmq-server |
| 83 | + to: |
| 84 | + - "lxc:0" |
| 85 | + ceph: |
| 86 | + charm: ceph |
| 87 | + num_units: 3 |
| 88 | + options: |
| 89 | + fsid: 11111111-2222-3333-4444-555555555555 |
| 90 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 91 | + osd-devices: /dev/vdb /dev/sdb |
| 92 | + osd-reformat: "yes" |
| 93 | + to: |
| 94 | + - "nova-compute=0" |
| 95 | + - "nova-compute=1" |
| 96 | + - "nova-compute=2" |
| 97 | + ceph-osd: |
| 98 | + charm: ceph-osd |
| 99 | + options: |
| 100 | + osd-devices: /dev/vdb /dev/sdb |
| 101 | + osd-reformat: "yes" |
| 102 | + to: |
| 103 | + - "0" |
| 104 | + swift-proxy: |
| 105 | + charm: swift-proxy |
| 106 | + options: |
| 107 | + zone-assignment: manual |
| 108 | + replicas: 3 |
| 109 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 110 | + to: |
| 111 | + - "lxc:0" |
| 112 | + swift-storage-z1: |
| 113 | + charm: swift-storage |
| 114 | + options: |
| 115 | + zone: 1 |
| 116 | + block-device: /dev/vdb /dev/sdb |
| 117 | + overwrite: "true" |
| 118 | + swift-storage-z2: |
| 119 | + charm: swift-storage |
| 120 | + options: |
| 121 | + zone: 2 |
| 122 | + block-device: /dev/vdb /dev/sdb |
| 123 | + overwrite: "true" |
| 124 | + swift-storage-z3: |
| 125 | + charm: swift-storage |
| 126 | + options: |
| 127 | + zone: 3 |
| 128 | + block-device: /dev/vdb /dev/sdb |
| 129 | + overwrite: "true" |
| 130 | + keystone: |
| 131 | + charm: keystone |
| 132 | + options: |
| 133 | + admin-password: openstack |
| 134 | + admin-token: ubuntutesting |
| 135 | + to: |
| 136 | + - "lxc:swift-storage-z1=0" |
| 137 | + openstack-dashboard: |
| 138 | + charm: openstack-dashboard |
| 139 | + to: |
| 140 | + - "lxc:swift-storage-z2=0" |
| 141 | + nova-compute: |
| 142 | + charm: nova-compute |
| 143 | + num_units: 3 |
| 144 | + options: |
| 145 | + enable-live-migration: True |
| 146 | + enable-resize: True |
| 147 | + migration-auth-type: ssh |
| 148 | + enable-resize: True |
| 149 | + nova-cloud-controller: |
| 150 | + charm: nova-cloud-controller |
| 151 | + options: |
| 152 | + network-manager: Neutron |
| 153 | + to: |
| 154 | + - "lxc:swift-storage-z3=0" |
| 155 | + neutron-gateway: |
| 156 | + charm: neutron-gateway |
| 157 | + options: |
| 158 | + ext-port: eth1 |
| 159 | + instance-mtu: 1300 |
| 160 | + to: |
| 161 | + - "0" |
| 162 | + cinder: |
| 163 | + charm: cinder |
| 164 | + options: |
| 165 | + block-device: "None" |
| 166 | + glance-api-version: 2 |
| 167 | + to: |
| 168 | + - "lxc:nova-compute=2" |
| 169 | + cinder-ceph: |
| 170 | + charm: cinder-ceph |
| 171 | + glance: |
| 172 | + charm: glance |
| 173 | + to: |
| 174 | + - "lxc:nova-compute=1" |
| 175 | + ceilometer: |
| 176 | + charm: ceilometer |
| 177 | + to: |
| 178 | + - "lxc:swift-storage-z1=0" |
| 179 | + ceilometer-agent: |
| 180 | + charm: ceilometer-agent |
| 181 | + heat: |
| 182 | + charm: heat |
| 183 | + to: |
| 184 | + - "lxc:swift-storage-z2=0" |
| 185 | + mongodb: |
| 186 | + charm: mongodb |
| 187 | + to: |
| 188 | + - "lxc:swift-storage-z3=0" |
| 189 | + ntp: |
| 190 | + charm: ntp |
| 191 | + num_units: 0 |
| 192 | +# juju-gui: |
| 193 | +# charm: juju-gui |
| 194 | +# to: |
| 195 | +# - "lxc:swift-storage-z3=0" |
| 196 | + relations: |
| 197 | + - [ keystone, mysql ] |
| 198 | + - [ nova-cloud-controller, mysql ] |
| 199 | + - [ nova-cloud-controller, rabbitmq-server ] |
| 200 | + - [ nova-cloud-controller, glance ] |
| 201 | + - [ nova-cloud-controller, keystone ] |
| 202 | + - [ nova-compute, nova-cloud-controller ] |
| 203 | + - [ nova-compute, mysql ] |
| 204 | + - - nova-compute |
| 205 | + - rabbitmq-server:amqp |
| 206 | + - [ nova-compute, glance ] |
| 207 | + - [ nova-compute, ceph ] |
| 208 | + - [ glance, mysql ] |
| 209 | + - [ glance, keystone ] |
| 210 | + - [ glance, ceph ] |
| 211 | + - [ glance, cinder ] |
| 212 | + - [ cinder, mysql ] |
| 213 | + - [ cinder, rabbitmq-server ] |
| 214 | + - [ cinder, nova-cloud-controller ] |
| 215 | + - [ cinder, keystone ] |
| 216 | + - [ cinder, cinder-ceph ] |
| 217 | + - [ cinder-ceph, ceph ] |
| 218 | + - [ neutron-gateway, nova-cloud-controller ] |
| 219 | + - [ openstack-dashboard, keystone ] |
| 220 | + - [ swift-proxy, keystone ] |
| 221 | + - [ swift-proxy, swift-storage-z1 ] |
| 222 | + - [ swift-proxy, swift-storage-z2 ] |
| 223 | + - [ swift-proxy, swift-storage-z3 ] |
| 224 | + - - ceilometer |
| 225 | + - keystone:identity-service |
| 226 | + - [ ceilometer, rabbitmq-server ] |
| 227 | + - [ ceilometer, mongodb ] |
| 228 | + - [ ceilometer-agent, nova-compute ] |
| 229 | + - [ ceilometer-agent, ceilometer ] |
| 230 | + - [ heat, mysql ] |
| 231 | + - [ heat, keystone ] |
| 232 | + - [ heat, rabbitmq-server ] |
| 233 | + - - ceph-osd:mon |
| 234 | + - ceph:osd |
| 235 | + - - ntp:juju-info |
| 236 | + - nova-compute:juju-info |
| 237 | + - - ntp:juju-info |
| 238 | + - neutron-gateway:juju-info |
| 239 | + - - ntp:juju-info |
| 240 | + - ceph-osd:juju-info |
| 241 | +openstack-singlerabbit: |
| 242 | + inherits: openstack-services |
| 243 | + relations: |
| 244 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
| 245 | +openstack-icehouse: |
| 246 | + inherits: openstack-singlerabbit |
| 247 | + services: |
| 248 | + neutron-api: |
| 249 | + charm: neutron-api |
| 250 | + options: |
| 251 | + neutron-security-groups: True |
| 252 | + to: |
| 253 | + - "lxc:nova-compute=0" |
| 254 | + neutron-openvswitch: |
| 255 | + charm: neutron-openvswitch |
| 256 | + relations: |
| 257 | + - [ neutron-api, mysql ] |
| 258 | + - [ neutron-api, rabbitmq-server ] |
| 259 | + - [ neutron-api, nova-cloud-controller ] |
| 260 | + - [ neutron-api, neutron-openvswitch ] |
| 261 | + - [ neutron-api, keystone ] |
| 262 | + - [ neutron-api, neutron-gateway ] |
| 263 | + - [ neutron-openvswitch, nova-compute ] |
| 264 | + - [ neutron-openvswitch, rabbitmq-server ] |
| 265 | +openstack-icehouse-msg-split: |
| 266 | + inherits: openstack-services |
| 267 | + services: |
| 268 | + neutron-api: |
| 269 | + charm: neutron-api |
| 270 | + options: |
| 271 | + neutron-security-groups: True |
| 272 | + neutron-openvswitch: |
| 273 | + charm: neutron-openvswitch |
| 274 | + rabbitmq-server-neutron: |
| 275 | + charm: rabbitmq-server |
| 276 | + relations: |
| 277 | + - [ neutron-api, mysql ] |
| 278 | + - [ neutron-api, rabbitmq-server-neutron ] |
| 279 | + - [ neutron-api, nova-cloud-controller ] |
| 280 | + - [ neutron-api, neutron-openvswitch ] |
| 281 | + - [ neutron-api, keystone ] |
| 282 | + - [ neutron-api, neutron-gateway ] |
| 283 | + - [ neutron-openvswitch, nova-compute ] |
| 284 | + - [ neutron-openvswitch, rabbitmq-server-neutron ] |
| 285 | + - [ "neutron-gateway:amqp-nova", rabbitmq-server ] |
| 286 | + - [ "neutron-gateway:amqp", rabbitmq-server-neutron ] |
| 287 | +# icehouse |
| 288 | +precise-icehouse: |
| 289 | + inherits: openstack-singlerabbit |
| 290 | + series: precise |
| 291 | + overrides: |
| 292 | + openstack-origin: cloud:precise-icehouse |
| 293 | + source: cloud:precise-icehouse |
| 294 | +precise-icehouse-proposed: |
| 295 | + inherits: precise-icehouse |
| 296 | + overrides: |
| 297 | + openstack-origin: cloud:precise-icehouse/proposed |
| 298 | + source: cloud:precise-updates/icehouse |
| 299 | +precise-icehouse-staging: |
| 300 | + inherits: precise-icehouse |
| 301 | + overrides: |
| 302 | + openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging |
| 303 | + source: ppa:ubuntu-cloud-archive/icehouse-staging |
| 304 | +precise-icehouse-trunk: |
| 305 | + inherits: precise-icehouse |
| 306 | + overrides: |
| 307 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 308 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 309 | +trusty-icehouse: |
| 310 | + inherits: openstack-icehouse |
| 311 | + series: trusty |
| 312 | +trusty-icehouse-msg-split: |
| 313 | + inherits: openstack-icehouse-msg-split |
| 314 | + series: trusty |
| 315 | +trusty-icehouse-proposed: |
| 316 | + inherits: trusty-icehouse |
| 317 | + overrides: |
| 318 | + source: proposed |
| 319 | + openstack-origin: distro-proposed |
| 320 | +trusty-icehouse-trunk: |
| 321 | + inherits: trusty-icehouse |
| 322 | + overrides: |
| 323 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 324 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 325 | + offline-compression: "no" |
| 326 | +# kilo |
| 327 | +trusty-kilo: |
| 328 | + inherits: openstack-icehouse |
| 329 | + series: trusty |
| 330 | + overrides: |
| 331 | + openstack-origin: cloud:trusty-kilo |
| 332 | + source: cloud:trusty-kilo |
| 333 | +trusty-kilo-proposed: |
| 334 | + inherits: trusty-kilo |
| 335 | + overrides: |
| 336 | + openstack-origin: cloud:trusty-kilo/proposed |
| 337 | + source: cloud:trusty-kilo/proposed |
| 338 | +trusty-kilo-staging: |
| 339 | + inherits: trusty-kilo |
| 340 | + overrides: |
| 341 | + openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging |
| 342 | + source: ppa:ubuntu-cloud-archive/kilo-staging |
| 343 | +# liberty |
| 344 | +trusty-liberty: |
| 345 | + inherits: openstack-icehouse |
| 346 | + series: trusty |
| 347 | + overrides: |
| 348 | + openstack-origin: cloud:trusty-liberty |
| 349 | + source: cloud:trusty-liberty |
| 350 | +trusty-liberty-proposed: |
| 351 | + inherits: trusty-liberty |
| 352 | + overrides: |
| 353 | + openstack-origin: cloud:trusty-liberty/proposed |
| 354 | + source: cloud:trusty-liberty/proposed |
| 355 | +trusty-liberty-staging: |
| 356 | + inherits: trusty-liberty |
| 357 | + overrides: |
| 358 | + openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
| 359 | + source: ppa:ubuntu-cloud-archive/liberty-staging |
| 360 | +wily-liberty: |
| 361 | + inherits: openstack-icehouse |
| 362 | + series: wily |
| 363 | +wily-liberty-proposed: |
| 364 | + inherits: wily-liberty |
| 365 | + overrides: |
| 366 | + source: proposed |
| 367 | + openstack-origin: distro-proposed |
| 368 | +# mitaka |
| 369 | +trusty-mitaka: |
| 370 | + inherits: openstack-icehouse |
| 371 | + series: trusty |
| 372 | + overrides: |
| 373 | + openstack-origin: cloud:trusty-mitaka |
| 374 | + source: cloud:trusty-mitaka |
| 375 | +trusty-mitaka-proposed: |
| 376 | + inherits: trusty-mitaka |
| 377 | + overrides: |
| 378 | + openstack-origin: cloud:trusty-mitaka/proposed |
| 379 | + source: cloud:trusty-mitaka/proposed |
| 380 | +trusty-mitaka-staging: |
| 381 | + inherits: trusty-mitaka |
| 382 | + overrides: |
| 383 | + openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
| 384 | + source: ppa:ubuntu-cloud-archive/mitaka-staging |
| 385 | +xenial-mitaka: |
| 386 | + inherits: openstack-icehouse |
| 387 | + series: xenial |
| 388 | +xenial-mitaka-proposed: |
| 389 | + inherits: xenial-mitaka |
| 390 | + overrides: |
| 391 | + source: proposed |
| 392 | + openstack-origin: distro-proposed |
| 393 | |
| 394 | === modified file 'helper/bundles/baremetal7.yaml' |
| 395 | --- helper/bundles/baremetal7.yaml 2016-04-08 14:00:41 +0000 |
| 396 | +++ helper/bundles/baremetal7.yaml 2016-04-12 03:41:29 +0000 |
| 397 | @@ -1,5 +1,7 @@ |
| 398 | # vim: set ts=2 et: |
| 399 | # |
| 400 | +# Config and topology for STABLE charms |
| 401 | +# |
| 402 | # A 7-machine bare metal bundle which is appx. equivalent to "sparse/next.yaml" |
| 403 | # with some smooshing and co-location for density. This is an EXAMPLE TEST BUNDLE. |
| 404 | # |
| 405 | |
| 406 | === added directory 'helper/bundles/deprecated' |
| 407 | === renamed file 'helper/bundles/ssl-everywhere.yaml' => 'helper/bundles/deprecated/ssl-everywhere.yaml' |
| 408 | --- helper/bundles/ssl-everywhere.yaml 2016-03-07 15:30:54 +0000 |
| 409 | +++ helper/bundles/deprecated/ssl-everywhere.yaml 2016-04-12 03:41:29 +0000 |
| 410 | @@ -1,4 +1,7 @@ |
| 411 | # vim: set ts=2 et: |
| 412 | +# |
| 413 | +# Config and topology for STABLE charms |
| 414 | +# |
| 415 | openstack-services: |
| 416 | services: |
| 417 | mysql: |
| 418 | @@ -45,7 +48,7 @@ |
| 419 | branch: lp:~openstack-charmers/charms/precise/nova-cloud-controller/ssl-everywhere |
| 420 | constraints: mem=1G |
| 421 | options: |
| 422 | - network-manager: Quantum |
| 423 | + network-manager: Neutron |
| 424 | quantum-security-groups: "yes" |
| 425 | neutron-gateway: |
| 426 | branch: lp:~openstack-charmers/charms/precise/quantum-gateway/ssl-everywhere |
| 427 | |
| 428 | === renamed file 'helper/bundles/full_dvr.yaml' => 'helper/bundles/full-dvr-next.yaml' |
| 429 | --- helper/bundles/full_dvr.yaml 2016-04-08 14:00:41 +0000 |
| 430 | +++ helper/bundles/full-dvr-next.yaml 2016-04-12 03:41:29 +0000 |
| 431 | @@ -40,8 +40,7 @@ |
| 432 | charm: nova-cloud-controller |
| 433 | constraints: mem=1G |
| 434 | options: |
| 435 | - network-manager: Quantum |
| 436 | - quantum-security-groups: "yes" |
| 437 | + network-manager: Neutron |
| 438 | cinder: |
| 439 | charm: cinder |
| 440 | options: |
| 441 | |
| 442 | === added file 'helper/bundles/full-next.yaml' |
| 443 | --- helper/bundles/full-next.yaml 1970-01-01 00:00:00 +0000 |
| 444 | +++ helper/bundles/full-next.yaml 2016-04-12 03:41:29 +0000 |
| 445 | @@ -0,0 +1,277 @@ |
| 446 | +# vim: set ts=2 et: |
| 447 | +openstack-services: |
| 448 | + services: |
| 449 | + mysql: |
| 450 | + charm: mysql |
| 451 | + constraints: mem=1G |
| 452 | + options: |
| 453 | + dataset-size: 50% |
| 454 | + rabbitmq-server: |
| 455 | + charm: rabbitmq-server |
| 456 | + constraints: mem=1G |
| 457 | + ceph: |
| 458 | + charm: ceph |
| 459 | + num_units: 3 |
| 460 | + constraints: mem=1G |
| 461 | + options: |
| 462 | + monitor-count: 3 |
| 463 | + fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
| 464 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 465 | + osd-devices: /dev/vdb |
| 466 | + osd-reformat: "yes" |
| 467 | + ephemeral-unmount: /mnt |
| 468 | + keystone: |
| 469 | + charm: keystone |
| 470 | + constraints: mem=1G |
| 471 | + options: |
| 472 | + admin-password: openstack |
| 473 | + admin-token: ubuntutesting |
| 474 | + openstack-dashboard: |
| 475 | + charm: openstack-dashboard |
| 476 | + constraints: mem=1G |
| 477 | + nova-compute: |
| 478 | + charm: nova-compute |
| 479 | + num_units: 3 |
| 480 | + constraints: mem=4G |
| 481 | + options: |
| 482 | + enable-live-migration: True |
| 483 | + enable-resize: True |
| 484 | + nova-cloud-controller: |
| 485 | + charm: nova-cloud-controller |
| 486 | + constraints: mem=1G |
| 487 | + options: |
| 488 | + network-manager: Neutron |
| 489 | + neutron-gateway: |
| 490 | + charm: neutron-gateway |
| 491 | + constraints: mem=1G |
| 492 | + options: |
| 493 | + instance-mtu: 1300 |
| 494 | + cinder: |
| 495 | + charm: cinder |
| 496 | + options: |
| 497 | + block-device: "None" |
| 498 | + glance-api-version: 2 |
| 499 | + constraints": mem=1G |
| 500 | + glance: |
| 501 | + charm: glance |
| 502 | + constraints: mem=1G |
| 503 | + swift-proxy: |
| 504 | + charm: swift-proxy |
| 505 | + constraints: mem=1G |
| 506 | + options: |
| 507 | + zone-assignment: manual |
| 508 | + replicas: 3 |
| 509 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 510 | + swift-storage-z1: |
| 511 | + charm: swift-storage |
| 512 | + constraints: mem=1G |
| 513 | + options: |
| 514 | + zone: 1 |
| 515 | + block-device: vdb |
| 516 | + overwrite: "true" |
| 517 | + swift-storage-z2: |
| 518 | + charm: swift-storage |
| 519 | + constraints: mem=1G |
| 520 | + options: |
| 521 | + zone: 2 |
| 522 | + block-device: vdb |
| 523 | + overwrite: "true" |
| 524 | + swift-storage-z3: |
| 525 | + charm: swift-storage |
| 526 | + constraints: mem=1G |
| 527 | + options: |
| 528 | + zone: 3 |
| 529 | + block-device: vdb |
| 530 | + overwrite: "true" |
| 531 | + ceilometer: |
| 532 | + charm: ceilometer |
| 533 | + constraints: mem=1G |
| 534 | + ceilometer-agent: |
| 535 | + charm: ceilometer-agent |
| 536 | + mongodb: |
| 537 | + charm: mongodb |
| 538 | + constraints: mem=1G |
| 539 | + relations: |
| 540 | + - [ keystone, mysql ] |
| 541 | + - [ nova-cloud-controller, mysql ] |
| 542 | + - [ nova-cloud-controller, rabbitmq-server ] |
| 543 | + - [ nova-cloud-controller, glance ] |
| 544 | + - [ nova-cloud-controller, keystone ] |
| 545 | + - [ nova-compute, nova-cloud-controller ] |
| 546 | + - [ nova-compute, mysql ] |
| 547 | + - - nova-compute |
| 548 | + - rabbitmq-server:amqp |
| 549 | + - [ nova-compute, glance ] |
| 550 | + - [ nova-compute, ceph ] |
| 551 | + - [ glance, mysql ] |
| 552 | + - [ glance, keystone ] |
| 553 | + - [ glance, ceph ] |
| 554 | + - [ glance, cinder ] |
| 555 | + - [ cinder, mysql ] |
| 556 | + - [ cinder, rabbitmq-server ] |
| 557 | + - [ cinder, nova-cloud-controller ] |
| 558 | + - [ cinder, keystone ] |
| 559 | + - [ cinder, ceph ] |
| 560 | + - [ neutron-gateway, nova-cloud-controller ] |
| 561 | + - [ openstack-dashboard, keystone ] |
| 562 | + - [ swift-proxy, keystone ] |
| 563 | + - [ swift-proxy, swift-storage-z1 ] |
| 564 | + - [ swift-proxy, swift-storage-z2 ] |
| 565 | + - [ swift-proxy, swift-storage-z3 ] |
| 566 | + - [ "ceilometer:identity-service", keystone ] |
| 567 | + - [ ceilometer, rabbitmq-server ] |
| 568 | + - [ ceilometer, mongodb ] |
| 569 | + - [ ceilometer-agent, nova-compute ] |
| 570 | + - [ ceilometer-agent, ceilometer ] |
| 571 | +openstack-singlerabbit: |
| 572 | + inherits: openstack-services |
| 573 | + relations: |
| 574 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
| 575 | +openstack-icehouse: |
| 576 | + inherits: openstack-singlerabbit |
| 577 | + services: |
| 578 | + neutron-api: |
| 579 | + charm: neutron-api |
| 580 | + constraints: mem=1G |
| 581 | + options: |
| 582 | + neutron-security-groups: True |
| 583 | + neutron-openvswitch: |
| 584 | + charm: neutron-openvswitch |
| 585 | + relations: |
| 586 | + - [ neutron-api, mysql ] |
| 587 | + - [ neutron-api, rabbitmq-server ] |
| 588 | + - [ neutron-api, nova-cloud-controller ] |
| 589 | + - [ neutron-api, neutron-openvswitch ] |
| 590 | + - [ neutron-api, keystone ] |
| 591 | + - [ neutron-openvswitch, nova-compute ] |
| 592 | + - [ neutron-openvswitch, rabbitmq-server ] |
| 593 | +openstack-icehouse-msg-split: |
| 594 | + inherits: openstack-services |
| 595 | + services: |
| 596 | + neutron-api: |
| 597 | + charm: neutron-api |
| 598 | + constraints: mem=1G |
| 599 | + options: |
| 600 | + neutron-security-groups: True |
| 601 | + neutron-openvswitch: |
| 602 | + charm: neutron-openvswitch |
| 603 | + rabbitmq-server-neutron: |
| 604 | + charm: rabbitmq-server |
| 605 | + constraints: mem=1G |
| 606 | + relations: |
| 607 | + - [ neutron-api, mysql ] |
| 608 | + - [ neutron-api, rabbitmq-server-neutron ] |
| 609 | + - [ neutron-api, nova-cloud-controller ] |
| 610 | + - [ neutron-api, neutron-openvswitch ] |
| 611 | + - [ neutron-api, keystone ] |
| 612 | + - [ neutron-api, neutron-gateway ] |
| 613 | + - [ neutron-openvswitch, nova-compute ] |
| 614 | + - [ neutron-openvswitch, rabbitmq-server-neutron ] |
| 615 | + - [ "neutron-gateway:amqp-nova", rabbitmq-server ] |
| 616 | + - [ "neutron-gateway:amqp", rabbitmq-server-neutron ] |
| 617 | +# icehouse |
| 618 | +precise-icehouse: |
| 619 | + inherits: openstack-singlerabbit |
| 620 | + series: precise |
| 621 | + overrides: |
| 622 | + openstack-origin: cloud:precise-icehouse |
| 623 | + source: cloud:precise-updates/icehouse |
| 624 | +precise-icehouse-proposed: |
| 625 | + inherits: precise-icehouse |
| 626 | + overrides: |
| 627 | + openstack-origin: cloud:precise-icehouse/proposed |
| 628 | + source: cloud:precise-updates/icehouse |
| 629 | +precise-icehouse-staging: |
| 630 | + inherits: precise-icehouse |
| 631 | + overrides: |
| 632 | + openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging |
| 633 | + source: ppa:ubuntu-cloud-archive/icehouse-staging |
| 634 | +precise-icehouse-trunk: |
| 635 | + inherits: precise-icehouse |
| 636 | + overrides: |
| 637 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 638 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 639 | +trusty-icehouse: |
| 640 | + inherits: openstack-icehouse |
| 641 | + series: trusty |
| 642 | +trusty-icehouse-msg-split: |
| 643 | + inherits: openstack-icehouse-msg-split |
| 644 | + series: trusty |
| 645 | +trusty-icehouse-proposed: |
| 646 | + inherits: trusty-icehouse |
| 647 | + overrides: |
| 648 | + source: proposed |
| 649 | + openstack-origin: distro-proposed |
| 650 | +trusty-icehouse-trunk: |
| 651 | + inherits: trusty-icehouse |
| 652 | + overrides: |
| 653 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 654 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 655 | + offline-compression: "no" |
| 656 | +# kilo |
| 657 | +trusty-kilo: |
| 658 | + inherits: openstack-icehouse |
| 659 | + series: trusty |
| 660 | + overrides: |
| 661 | + openstack-origin: cloud:trusty-kilo |
| 662 | + source: cloud:trusty-kilo |
| 663 | +trusty-kilo-proposed: |
| 664 | + inherits: trusty-kilo |
| 665 | + overrides: |
| 666 | + openstack-origin: cloud:trusty-kilo/proposed |
| 667 | + source: cloud:trusty-proposed/kilo |
| 668 | +trusty-kilo-staging: |
| 669 | + inherits: trusty-kilo |
| 670 | + overrides: |
| 671 | + openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging |
| 672 | + source: ppa:ubuntu-cloud-archive/kilo-staging |
| 673 | +# liberty |
| 674 | +trusty-liberty: |
| 675 | + inherits: openstack-icehouse |
| 676 | + series: trusty |
| 677 | + overrides: |
| 678 | + openstack-origin: cloud:trusty-liberty |
| 679 | + source: cloud:trusty-liberty |
| 680 | +trusty-liberty-proposed: |
| 681 | + inherits: trusty-liberty |
| 682 | + overrides: |
| 683 | + openstack-origin: cloud:trusty-liberty/proposed |
| 684 | + source: cloud:trusty-liberty/proposed |
| 685 | +trusty-liberty-staging: |
| 686 | + inherits: trusty-liberty |
| 687 | + overrides: |
| 688 | + openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
| 689 | + source: ppa:ubuntu-cloud-archive/liberty-staging |
| 690 | +wily-liberty: |
| 691 | + inherits: openstack-icehouse |
| 692 | + series: wily |
| 693 | +wily-liberty-proposed: |
| 694 | + inherits: wily-liberty |
| 695 | + overrides: |
| 696 | + source: proposed |
| 697 | + openstack-origin: distro-proposed |
| 698 | +# mitaka |
| 699 | +trusty-mitaka: |
| 700 | + inherits: openstack-icehouse |
| 701 | + series: trusty |
| 702 | + overrides: |
| 703 | + openstack-origin: cloud:trusty-mitaka |
| 704 | + source: cloud:trusty-mitaka |
| 705 | +trusty-mitaka-proposed: |
| 706 | + inherits: trusty-mitaka |
| 707 | + overrides: |
| 708 | + openstack-origin: cloud:trusty-mitaka/proposed |
| 709 | + source: cloud:trusty-proposed/mitaka |
| 710 | +trusty-mitaka-staging: |
| 711 | + inherits: trusty-mitaka |
| 712 | + overrides: |
| 713 | + openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging |
| 714 | + source: ppa:ubuntu-cloud-archive/mitaka-staging |
| 715 | +xenial-mitaka: |
| 716 | + inherits: openstack-icehouse |
| 717 | + series: xenial |
| 718 | +xenial-mitaka-proposed: |
| 719 | + inherits: xenial-mitaka |
| 720 | + overrides: |
| 721 | + source: proposed |
| 722 | + openstack-origin: distro-proposed |
| 723 | |
| 724 | === added file 'helper/bundles/full-ssl-next.yaml' |
| 725 | --- helper/bundles/full-ssl-next.yaml 1970-01-01 00:00:00 +0000 |
| 726 | +++ helper/bundles/full-ssl-next.yaml 2016-04-12 03:41:29 +0000 |
| 727 | @@ -0,0 +1,256 @@ |
| 728 | +# vim: set ts=2 et: |
| 729 | +openstack-services: |
| 730 | + services: |
| 731 | + mysql: |
| 732 | + charm: mysql |
| 733 | + constraints: mem=1G |
| 734 | + options: |
| 735 | + dataset-size: 50% |
| 736 | + rabbitmq-server: |
| 737 | + charm: rabbitmq-server |
| 738 | + constraints: mem=1G |
| 739 | + options: |
| 740 | + ssl: "only" |
| 741 | + ceph: |
| 742 | + charm: ceph |
| 743 | + num_units: 3 |
| 744 | + constraints: mem=1G |
| 745 | + options: |
| 746 | + monitor-count: 3 |
| 747 | + fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
| 748 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 749 | + osd-devices: /dev/vdb |
| 750 | + osd-reformat: "yes" |
| 751 | + ephemeral-unmount: /mnt |
| 752 | + keystone: |
| 753 | + charm: keystone |
| 754 | + constraints: mem=1G |
| 755 | + options: |
| 756 | + admin-password: openstack |
| 757 | + admin-token: ubuntutesting |
| 758 | + https-service-endpoints: "True" |
| 759 | + use-https: "yes" |
| 760 | + openstack-dashboard: |
| 761 | + charm: openstack-dashboard |
| 762 | + constraints: mem=1G |
| 763 | + nova-compute: |
| 764 | + charm: nova-compute |
| 765 | + num_units: 3 |
| 766 | + constraints: mem=4G |
| 767 | + options: |
| 768 | + enable-live-migration: True |
| 769 | + enable-resize: True |
| 770 | + nova-cloud-controller: |
| 771 | + charm: nova-cloud-controller |
| 772 | + constraints: mem=1G |
| 773 | + options: |
| 774 | + network-manager: Neutron |
| 775 | + neutron-gateway: |
| 776 | + charm: neutron-gateway |
| 777 | + constraints: mem=1G |
| 778 | + options: |
| 779 | + instance-mtu: 1300 |
| 780 | + cinder: |
| 781 | + charm: cinder |
| 782 | + options: |
| 783 | + block-device: "None" |
| 784 | + glance-api-version: 2 |
| 785 | + constraints": mem=1G |
| 786 | + glance: |
| 787 | + charm: glance |
| 788 | + constraints: mem=1G |
| 789 | + swift-proxy: |
| 790 | + charm: swift-proxy |
| 791 | + constraints: mem=1G |
| 792 | + options: |
| 793 | + zone-assignment: manual |
| 794 | + replicas: 3 |
| 795 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 796 | + swift-storage-z1: |
| 797 | + charm: swift-storage |
| 798 | + constraints: mem=1G |
| 799 | + options: |
| 800 | + zone: 1 |
| 801 | + block-device: vdb |
| 802 | + overwrite: "true" |
| 803 | + swift-storage-z2: |
| 804 | + charm: swift-storage |
| 805 | + constraints: mem=1G |
| 806 | + options: |
| 807 | + zone: 2 |
| 808 | + block-device: vdb |
| 809 | + overwrite: "true" |
| 810 | + swift-storage-z3: |
| 811 | + charm: swift-storage |
| 812 | + constraints: mem=1G |
| 813 | + options: |
| 814 | + zone: 3 |
| 815 | + block-device: vdb |
| 816 | + overwrite: "true" |
| 817 | + ceilometer: |
| 818 | + charm: ceilometer |
| 819 | + constraints: mem=1G |
| 820 | + ceilometer-agent: |
| 821 | + charm: ceilometer-agent |
| 822 | + mongodb: |
| 823 | + charm: mongodb |
| 824 | + constraints: mem=1G |
| 825 | + relations: |
| 826 | + - [ keystone, mysql ] |
| 827 | + - [ nova-cloud-controller, mysql ] |
| 828 | + - [ nova-cloud-controller, rabbitmq-server ] |
| 829 | + - [ nova-cloud-controller, glance ] |
| 830 | + - [ nova-cloud-controller, keystone ] |
| 831 | + - [ nova-compute, nova-cloud-controller ] |
| 832 | + - [ nova-compute, mysql ] |
| 833 | + - - nova-compute |
| 834 | + - rabbitmq-server:amqp |
| 835 | + - [ nova-compute, glance ] |
| 836 | + - [ nova-compute, ceph ] |
| 837 | + - [ glance, mysql ] |
| 838 | + - [ glance, keystone ] |
| 839 | + - [ glance, ceph ] |
| 840 | + - [ glance, cinder ] |
| 841 | + - [ cinder, mysql ] |
| 842 | + - [ cinder, rabbitmq-server ] |
| 843 | + - [ cinder, nova-cloud-controller ] |
| 844 | + - [ cinder, keystone ] |
| 845 | + - [ cinder, ceph ] |
| 846 | + - [ neutron-gateway, nova-cloud-controller ] |
| 847 | + - [ openstack-dashboard, keystone ] |
| 848 | + - [ swift-proxy, keystone ] |
| 849 | + - [ swift-proxy, swift-storage-z1 ] |
| 850 | + - [ swift-proxy, swift-storage-z2 ] |
| 851 | + - [ swift-proxy, swift-storage-z3 ] |
| 852 | + - [ "ceilometer:identity-service", keystone ] |
| 853 | + - [ ceilometer, rabbitmq-server ] |
| 854 | + - [ ceilometer, mongodb ] |
| 855 | + - [ ceilometer-agent, nova-compute ] |
| 856 | + - [ ceilometer-agent, ceilometer ] |
| 857 | +openstack-singlerabbit: |
| 858 | + inherits: openstack-services |
| 859 | + relations: |
| 860 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
| 861 | +openstack-icehouse: |
| 862 | + inherits: openstack-singlerabbit |
| 863 | + services: |
| 864 | + neutron-api: |
| 865 | + charm: neutron-api |
| 866 | + constraints: mem=1G |
| 867 | + options: |
| 868 | + neutron-security-groups: True |
| 869 | + neutron-openvswitch: |
| 870 | + charm: neutron-openvswitch |
| 871 | + relations: |
| 872 | + - [ neutron-api, mysql ] |
| 873 | + - [ neutron-api, rabbitmq-server ] |
| 874 | + - [ neutron-api, nova-cloud-controller ] |
| 875 | + - [ neutron-api, neutron-openvswitch ] |
| 876 | + - [ neutron-api, keystone ] |
| 877 | + - [ neutron-openvswitch, nova-compute ] |
| 878 | + - [ neutron-openvswitch, rabbitmq-server ] |
| 879 | +openstack-icehouse-msg-split: |
| 880 | + inherits: openstack-services |
| 881 | + services: |
| 882 | + neutron-api: |
| 883 | + charm: neutron-api |
| 884 | + constraints: mem=1G |
| 885 | + options: |
| 886 | + neutron-security-groups: True |
| 887 | + neutron-openvswitch: |
| 888 | + charm: neutron-openvswitch |
| 889 | + rabbitmq-server-neutron: |
| 890 | + charm: rabbitmq-server |
| 891 | + constraints: mem=1G |
| 892 | + relations: |
| 893 | + - [ neutron-api, mysql ] |
| 894 | + - [ neutron-api, rabbitmq-server-neutron ] |
| 895 | + - [ neutron-api, nova-cloud-controller ] |
| 896 | + - [ neutron-api, neutron-openvswitch ] |
| 897 | + - [ neutron-api, keystone ] |
| 898 | + - [ neutron-api, neutron-gateway ] |
| 899 | + - [ neutron-openvswitch, nova-compute ] |
| 900 | + - [ neutron-openvswitch, rabbitmq-server-neutron ] |
| 901 | + - [ "neutron-gateway:amqp-nova", rabbitmq-server ] |
| 902 | + - [ "neutron-gateway:amqp", rabbitmq-server-neutron ] |
| 903 | +# icehouse |
| 904 | +precise-icehouse: |
| 905 | + inherits: openstack-singlerabbit |
| 906 | + series: precise |
| 907 | + overrides: |
| 908 | + openstack-origin: cloud:precise-icehouse |
| 909 | + source: cloud:precise-updates/icehouse |
| 910 | +precise-icehouse-proposed: |
| 911 | + inherits: precise-icehouse |
| 912 | + overrides: |
| 913 | + openstack-origin: cloud:precise-icehouse/proposed |
| 914 | + source: cloud:precise-updates/icehouse |
| 915 | +precise-icehouse-staging: |
| 916 | + inherits: precise-icehouse |
| 917 | + overrides: |
| 918 | + openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging |
| 919 | + source: ppa:ubuntu-cloud-archive/icehouse-staging |
| 920 | +precise-icehouse-trunk: |
| 921 | + inherits: precise-icehouse |
| 922 | + overrides: |
| 923 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 924 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 925 | +trusty-icehouse: |
| 926 | + inherits: openstack-icehouse |
| 927 | + series: trusty |
| 928 | +trusty-icehouse-msg-split: |
| 929 | + inherits: openstack-icehouse-msg-split |
| 930 | + series: trusty |
| 931 | +trusty-icehouse-proposed: |
| 932 | + inherits: trusty-icehouse |
| 933 | + overrides: |
| 934 | + source: proposed |
| 935 | + openstack-origin: distro-proposed |
| 936 | +trusty-icehouse-trunk: |
| 937 | + inherits: trusty-icehouse |
| 938 | + overrides: |
| 939 | + openstack-origin: ppa:openstack-ubuntu-testing/icehouse |
| 940 | + source: ppa:openstack-ubuntu-testing/icehouse |
| 941 | + offline-compression: "no" |
| 942 | +# kilo |
| 943 | +trusty-kilo: |
| 944 | + inherits: openstack-icehouse |
| 945 | + series: trusty |
| 946 | + overrides: |
| 947 | + openstack-origin: cloud:trusty-kilo |
| 948 | + source: cloud:trusty-kilo |
| 949 | +trusty-kilo-proposed: |
| 950 | + inherits: trusty-kilo |
| 951 | + overrides: |
| 952 | + openstack-origin: cloud:trusty-kilo/proposed |
| 953 | + source: cloud:trusty-proposed/kilo |
| 954 | +trusty-kilo-staging: |
| 955 | + inherits: trusty-kilo |
| 956 | + overrides: |
| 957 | + openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging |
| 958 | + source: ppa:ubuntu-cloud-archive/kilo-staging |
| 959 | +# liberty |
| 960 | +trusty-liberty: |
| 961 | + inherits: openstack-icehouse |
| 962 | + series: trusty |
| 963 | + overrides: |
| 964 | + openstack-origin: cloud:trusty-liberty |
| 965 | + source: cloud:trusty-liberty |
| 966 | +trusty-liberty-proposed: |
| 967 | + inherits: trusty-liberty |
| 968 | + overrides: |
| 969 | + openstack-origin: cloud:trusty-liberty/proposed |
| 970 | + source: cloud:trusty-liberty/proposed |
| 971 | +trusty-liberty-staging: |
| 972 | + inherits: trusty-liberty |
| 973 | + overrides: |
| 974 | + openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
| 975 | + source: ppa:ubuntu-cloud-archive/liberty-staging |
| 976 | +wily-liberty: |
| 977 | + inherits: openstack-icehouse |
| 978 | + series: wily |
| 979 | +wily-liberty-proposed: |
| 980 | + inherits: wily-liberty |
| 981 | + overrides: |
| 982 | + source: proposed |
| 983 | + openstack-origin: distro-proposed |
| 984 | |
| 985 | === renamed file 'helper/bundles/full_ssl.yaml' => 'helper/bundles/full-ssl.yaml' |
| 986 | --- helper/bundles/full_ssl.yaml 2016-04-08 14:00:41 +0000 |
| 987 | +++ helper/bundles/full-ssl.yaml 2016-04-12 03:41:29 +0000 |
| 988 | @@ -1,4 +1,7 @@ |
| 989 | # vim: set ts=2 et: |
| 990 | +# |
| 991 | +# Config and topology for STABLE charms |
| 992 | +# |
| 993 | openstack-services: |
| 994 | services: |
| 995 | mysql: |
| 996 | |
| 997 | === renamed file 'helper/bundles/full_vrrpha.yaml' => 'helper/bundles/full-vrrpha-next.yaml' |
| 998 | --- helper/bundles/full_vrrpha.yaml 2016-04-08 14:00:41 +0000 |
| 999 | +++ helper/bundles/full-vrrpha-next.yaml 2016-04-12 03:41:29 +0000 |
| 1000 | @@ -29,7 +29,7 @@ |
| 1001 | charm: nova-cloud-controller |
| 1002 | constraints: mem=1G |
| 1003 | options: |
| 1004 | - network-manager: Quantum |
| 1005 | + network-manager: Neutron |
| 1006 | quantum-security-groups: "yes" |
| 1007 | neutron-gateway: |
| 1008 | charm: neutron-gateway |
| 1009 | |
| 1010 | === modified file 'helper/bundles/full.yaml' |
| 1011 | --- helper/bundles/full.yaml 2016-04-08 14:00:41 +0000 |
| 1012 | +++ helper/bundles/full.yaml 2016-04-12 03:41:29 +0000 |
| 1013 | @@ -1,4 +1,7 @@ |
| 1014 | # vim: set ts=2 et: |
| 1015 | +# |
| 1016 | +# Config and topology for STABLE charms |
| 1017 | +# |
| 1018 | openstack-services: |
| 1019 | services: |
| 1020 | mysql: |
| 1021 | @@ -40,7 +43,7 @@ |
| 1022 | charm: nova-cloud-controller |
| 1023 | constraints: mem=1G |
| 1024 | options: |
| 1025 | - network-manager: Quantum |
| 1026 | + network-manager: Neutron |
| 1027 | quantum-security-groups: "yes" |
| 1028 | neutron-gateway: |
| 1029 | charm: neutron-gateway |
| 1030 | |
| 1031 | === renamed file 'helper/bundles/ha.yaml' => 'helper/bundles/ha-next.yaml' |
| 1032 | --- helper/bundles/ha.yaml 2016-04-08 14:00:41 +0000 |
| 1033 | +++ helper/bundles/ha-next.yaml 2016-04-12 03:41:29 +0000 |
| 1034 | @@ -1,6 +1,4 @@ |
| 1035 | # vim: set ts=2 et: |
| 1036 | -# deployer bundle for development ('next') charms |
| 1037 | -# UOSCI relies on this for OS-on-OS deployment testing |
| 1038 | openstack-services: |
| 1039 | services: |
| 1040 | mysql: |
| 1041 | @@ -69,7 +67,6 @@ |
| 1042 | num_units: 3 |
| 1043 | options: |
| 1044 | network-manager: Neutron |
| 1045 | - quantum-security-groups: "yes" |
| 1046 | vip: 10.5.100.4 |
| 1047 | nova-cc-hacluster: |
| 1048 | charm: hacluster |
| 1049 | |
| 1050 | === added file 'helper/bundles/ha.yaml' |
| 1051 | --- helper/bundles/ha.yaml 1970-01-01 00:00:00 +0000 |
| 1052 | +++ helper/bundles/ha.yaml 2016-04-12 03:41:29 +0000 |
| 1053 | @@ -0,0 +1,272 @@ |
| 1054 | +# vim: set ts=2 et: |
| 1055 | +# |
| 1056 | +# Config and topology for STABLE charms |
| 1057 | +# |
| 1058 | +openstack-services: |
| 1059 | + services: |
| 1060 | + mysql: |
| 1061 | + charm: percona-cluster |
| 1062 | + constraints: mem=1G |
| 1063 | + num_units: 3 |
| 1064 | + options: |
| 1065 | + innodb-buffer-pool-size: 200M |
| 1066 | + sst-password: changeme |
| 1067 | + root-password: changeme |
| 1068 | + vip: 10.5.100.1 |
| 1069 | + mysql-hacluster: |
| 1070 | + charm: hacluster |
| 1071 | + options: |
| 1072 | + corosync_transport: unicast |
| 1073 | + cluster_count: 3 |
| 1074 | + rabbitmq-server: |
| 1075 | + charm: rabbitmq-server |
| 1076 | + constraints: mem=1G |
| 1077 | + num_units: 3 |
| 1078 | + ceph: |
| 1079 | + charm: ceph |
| 1080 | + num_units: 3 |
| 1081 | + constraints: mem=1G |
| 1082 | + options: |
| 1083 | + monitor-count: 3 |
| 1084 | + fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
| 1085 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 1086 | + osd-devices: /dev/vdb |
| 1087 | + osd-reformat: "yes" |
| 1088 | + ephemeral-unmount: /mnt |
| 1089 | + keystone: |
| 1090 | + charm: keystone |
| 1091 | + constraints: mem=1G |
| 1092 | + num_units: 3 |
| 1093 | + options: |
| 1094 | + admin-password: openstack |
| 1095 | + admin-token: ubuntutesting |
| 1096 | + vip: 10.5.100.2 |
| 1097 | + keystone-hacluster: |
| 1098 | + charm: hacluster |
| 1099 | + options: |
| 1100 | + corosync_transport: unicast |
| 1101 | + cluster_count: 3 |
| 1102 | + openstack-dashboard: |
| 1103 | + charm: openstack-dashboard |
| 1104 | + constraints: mem=1G |
| 1105 | + num_units: 3 |
| 1106 | + options: |
| 1107 | + vip: 10.5.100.3 |
| 1108 | + dashboard-hacluster: |
| 1109 | + charm: hacluster |
| 1110 | + options: |
| 1111 | + corosync_transport: unicast |
| 1112 | + cluster_count: 3 |
| 1113 | + nova-compute: |
| 1114 | + charm: nova-compute |
| 1115 | + num_units: 3 |
| 1116 | + constraints: mem=4G |
| 1117 | + options: |
| 1118 | + enable-live-migration: True |
| 1119 | + enable-resize: True |
| 1120 | + nova-cloud-controller: |
| 1121 | + charm: nova-cloud-controller |
| 1122 | + constraints: mem=1G |
| 1123 | + num_units: 3 |
| 1124 | + options: |
| 1125 | + network-manager: Neutron |
| 1126 | + quantum-security-groups: "yes" |
| 1127 | + vip: 10.5.100.4 |
| 1128 | + nova-cc-hacluster: |
| 1129 | + charm: hacluster |
| 1130 | + options: |
| 1131 | + corosync_transport: unicast |
| 1132 | + cluster_count: 3 |
| 1133 | + neutron-gateway: |
| 1134 | + charm: neutron-gateway |
| 1135 | + constraints: mem=1G |
| 1136 | + options: |
| 1137 | + instance-mtu: 1300 |
| 1138 | + cinder: |
| 1139 | + charm: cinder |
| 1140 | + constraints: mem=1G |
| 1141 | + num_units: 3 |
| 1142 | + options: |
| 1143 | + block-device: "None" |
| 1144 | + glance-api-version: 2 |
| 1145 | + vip: 10.5.100.5 |
| 1146 | + cinder-hacluster: |
| 1147 | + charm: hacluster |
| 1148 | + options: |
| 1149 | + corosync_transport: unicast |
| 1150 | + cluster_count: 3 |
| 1151 | + cinder-ceph: |
| 1152 | + charm: cinder-ceph |
| 1153 | + glance: |
| 1154 | + charm: glance |
| 1155 | + constraints: mem=1G |
| 1156 | + num_units: 3 |
| 1157 | + options: |
| 1158 | + vip: 10.5.100.9 |
| 1159 | + glance-hacluster: |
| 1160 | + charm: hacluster |
| 1161 | + options: |
| 1162 | + corosync_transport: unicast |
| 1163 | + cluster_count: 3 |
| 1164 | + swift-proxy: |
| 1165 | + charm: swift-proxy |
| 1166 | + constraints: mem=1G |
| 1167 | + num_units: 3 |
| 1168 | + options: |
| 1169 | + zone-assignment: manual |
| 1170 | + replicas: 3 |
| 1171 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 1172 | + vip: 10.5.100.6 |
| 1173 | + swift-hacluster: |
| 1174 | + charm: hacluster |
| 1175 | + options: |
| 1176 | + corosync_transport: unicast |
| 1177 | + cluster_count: 3 |
| 1178 | + swift-storage-z1: |
| 1179 | + charm: swift-storage |
| 1180 | + constraints: mem=1G |
| 1181 | + options: |
| 1182 | + zone: 1 |
| 1183 | + block-device: vdb |
| 1184 | + overwrite: "true" |
| 1185 | + swift-storage-z2: |
| 1186 | + charm: swift-storage |
| 1187 | + constraints: mem=1G |
| 1188 | + options: |
| 1189 | + zone: 2 |
| 1190 | + block-device: vdb |
| 1191 | + overwrite: "true" |
| 1192 | + swift-storage-z3: |
| 1193 | + charm: swift-storage |
| 1194 | + constraints: mem=1G |
| 1195 | + options: |
| 1196 | + zone: 3 |
| 1197 | + block-device: vdb |
| 1198 | + overwrite: "true" |
| 1199 | + ceilometer: |
| 1200 | + charm: ceilometer |
| 1201 | + constraints: mem=1G |
| 1202 | + num_units: 3 |
| 1203 | + options: |
| 1204 | + vip: 10.5.100.7 |
| 1205 | + ceilometer-hacluster: |
| 1206 | + charm: hacluster |
| 1207 | + options: |
| 1208 | + corosync_transport: unicast |
| 1209 | + cluster_count: 3 |
| 1210 | + ceilometer-agent: |
| 1211 | + charm: ceilometer-agent |
| 1212 | + heat: |
| 1213 | + charm: heat |
| 1214 | + mongodb: |
| 1215 | + charm: mongodb |
| 1216 | + constraints: mem=1G |
| 1217 | + neutron-api: |
| 1218 | + charm: neutron-api |
| 1219 | + constraints: mem=1G |
| 1220 | + num_units: 3 |
| 1221 | + options: |
| 1222 | + neutron-security-groups: True |
| 1223 | + vip: 10.5.100.8 |
| 1224 | + neutron-hacluster: |
| 1225 | + charm: hacluster |
| 1226 | + options: |
| 1227 | + corosync_transport: unicast |
| 1228 | + cluster_count: 3 |
| 1229 | + neutron-openvswitch: |
| 1230 | + charm: neutron-openvswitch |
| 1231 | + relations: |
| 1232 | + - [ keystone, mysql ] |
| 1233 | + - [ nova-cloud-controller, mysql ] |
| 1234 | + - [ nova-cloud-controller, rabbitmq-server ] |
| 1235 | + - [ nova-cloud-controller, glance ] |
| 1236 | + - [ nova-cloud-controller, keystone ] |
| 1237 | + - [ nova-compute, nova-cloud-controller ] |
| 1238 | + - [ nova-compute, mysql ] |
| 1239 | + - - nova-compute |
| 1240 | + - rabbitmq-server:amqp |
| 1241 | + - [ nova-compute, glance ] |
| 1242 | + - [ nova-compute, ceph ] |
| 1243 | + - [ glance, mysql ] |
| 1244 | + - [ glance, keystone ] |
| 1245 | + - [ glance, ceph ] |
| 1246 | + - [ glance, cinder ] |
| 1247 | + - [ cinder, mysql ] |
| 1248 | + - [ cinder, rabbitmq-server ] |
| 1249 | + - [ cinder, nova-cloud-controller ] |
| 1250 | + - [ cinder, keystone ] |
| 1251 | + - [ cinder, cinder-ceph ] |
| 1252 | + - [ cinder-ceph, ceph ] |
| 1253 | + - [ neutron-gateway, nova-cloud-controller ] |
| 1254 | + - [ openstack-dashboard, keystone ] |
| 1255 | + - [ swift-proxy, keystone ] |
| 1256 | + - [ swift-proxy, swift-storage-z1 ] |
| 1257 | + - [ swift-proxy, swift-storage-z2 ] |
| 1258 | + - [ swift-proxy, swift-storage-z3 ] |
| 1259 | + - - ceilometer |
| 1260 | + - keystone:identity-service |
| 1261 | + - [ ceilometer, rabbitmq-server ] |
| 1262 | + - [ ceilometer, mongodb ] |
| 1263 | + - [ ceilometer-agent, nova-compute ] |
| 1264 | + - [ ceilometer-agent, ceilometer ] |
| 1265 | + - [ heat, mysql ] |
| 1266 | + - [ heat, keystone ] |
| 1267 | + - [ heat, rabbitmq-server ] |
| 1268 | + - [ mysql, mysql-hacluster ] |
| 1269 | + - [ keystone, keystone-hacluster ] |
| 1270 | + - [ nova-cloud-controller, nova-cc-hacluster ] |
| 1271 | + - [ cinder, cinder-hacluster ] |
| 1272 | + - [ glance, glance-hacluster ] |
| 1273 | + - [ openstack-dashboard, dashboard-hacluster ] |
| 1274 | + - [ ceilometer, ceilometer-hacluster ] |
| 1275 | + - [ swift-proxy, swift-hacluster ] |
| 1276 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
| 1277 | + - [ neutron-api, mysql ] |
| 1278 | + - [ neutron-api, rabbitmq-server ] |
| 1279 | + - [ neutron-api, nova-cloud-controller ] |
| 1280 | + - [ neutron-api, neutron-openvswitch ] |
| 1281 | + - [ neutron-api, keystone ] |
| 1282 | + - [ neutron-api, neutron-gateway ] |
| 1283 | + - [ neutron-openvswitch, nova-compute ] |
| 1284 | + - [ neutron-openvswitch, rabbitmq-server ] |
| 1285 | + - [ neutron-api, neutron-hacluster ] |
| 1286 | +# icehouse |
| 1287 | +trusty-icehouse-ha: |
| 1288 | + inherits: openstack-services |
| 1289 | + series: trusty |
| 1290 | +# kilo |
| 1291 | +trusty-kilo-ha: |
| 1292 | + inherits: openstack-services |
| 1293 | + series: trusty |
| 1294 | + overrides: |
| 1295 | + openstack-origin: cloud:trusty-kilo |
| 1296 | + source: cloud:trusty-kilo |
| 1297 | +trusty-liberty-ha: |
| 1298 | + inherits: openstack-services |
| 1299 | + series: trusty |
| 1300 | + overrides: |
| 1301 | + openstack-origin: cloud:trusty-liberty |
| 1302 | + source: cloud:trusty-liberty |
| 1303 | +trusty-mitaka-ha: |
| 1304 | + inherits: openstack-services |
| 1305 | + series: trusty |
| 1306 | + overrides: |
| 1307 | + openstack-origin: cloud:trusty-mitaka/proposed |
| 1308 | + source: cloud:trusty-mitaka |
| 1309 | +trusty-mitaka-proposed: |
| 1310 | + inherits: openstack-services |
| 1311 | + series: trusty |
| 1312 | + overrides: |
| 1313 | + openstack-origin: cloud:trusty-mitaka/proposed |
| 1314 | + source: cloud:trusty-mitaka/proposed |
| 1315 | +xenial-mitaka-ha: |
| 1316 | + inherits: openstack-services |
| 1317 | + series: xenial |
| 1318 | + services: |
| 1319 | + mysql: |
| 1320 | + branch: lp:charms/trusty/mysql |
| 1321 | +xenial-mitaka-proposed: |
| 1322 | + inherits: xenial-mitaka |
| 1323 | + overrides: |
| 1324 | + source: proposed |
| 1325 | + openstack-origin: distro-proposed |
| 1326 | |
| 1327 | === renamed file 'helper/bundles/haphase1.yaml' => 'helper/bundles/haphase1-next.yaml' |
| 1328 | --- helper/bundles/haphase1.yaml 2016-04-08 14:00:41 +0000 |
| 1329 | +++ helper/bundles/haphase1-next.yaml 2016-04-12 03:41:29 +0000 |
| 1330 | @@ -50,8 +50,7 @@ |
| 1331 | constraints: mem=1G |
| 1332 | num_units: 2 |
| 1333 | options: |
| 1334 | - network-manager: Quantum |
| 1335 | - quantum-security-groups: "yes" |
| 1336 | + network-manager: Neutron |
| 1337 | vip: 10.5.100.3 |
| 1338 | ncc-hacluster: |
| 1339 | charm: hacluster |
| 1340 | |
| 1341 | === added file 'helper/bundles/haphase1.yaml' |
| 1342 | --- helper/bundles/haphase1.yaml 1970-01-01 00:00:00 +0000 |
| 1343 | +++ helper/bundles/haphase1.yaml 2016-04-12 03:41:29 +0000 |
| 1344 | @@ -0,0 +1,216 @@ |
| 1345 | +# vim: set ts=2 et: |
| 1346 | +# |
| 1347 | +# Config and topology for STABLE charms |
| 1348 | +# |
| 1349 | +openstack-services: |
| 1350 | + series: trusty |
| 1351 | + services: |
| 1352 | + mysql-hacluster: |
| 1353 | + charm: hacluster |
| 1354 | + rabbitmq-server: |
| 1355 | + charm: rabbitmq-server |
| 1356 | + constraints: mem=1G |
| 1357 | + num_units: 2 |
| 1358 | + ceph: |
| 1359 | + charm: ceph |
| 1360 | + num_units: 3 |
| 1361 | + constraints: mem=1G |
| 1362 | + options: |
| 1363 | + monitor-count: 3 |
| 1364 | + fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
| 1365 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 1366 | + osd-devices: /dev/vdb |
| 1367 | + osd-reformat: "yes" |
| 1368 | + ephemeral-unmount: /mnt |
| 1369 | + keystone: |
| 1370 | + charm: keystone |
| 1371 | + constraints: mem=1G |
| 1372 | + num_units: 2 |
| 1373 | + options: |
| 1374 | + admin-password: openstack |
| 1375 | + admin-token: ubuntutesting |
| 1376 | + vip: 10.5.100.1 |
| 1377 | + keystone-hacluster: |
| 1378 | + charm: hacluster |
| 1379 | + openstack-dashboard: |
| 1380 | + charm: openstack-dashboard |
| 1381 | + constraints: mem=1G |
| 1382 | + num_units: 2 |
| 1383 | + options: |
| 1384 | + vip: 10.5.100.2 |
| 1385 | + dashboard-hacluster: |
| 1386 | + charm: hacluster |
| 1387 | + nova-compute: |
| 1388 | + charm: nova-compute |
| 1389 | + num_units: 3 |
| 1390 | + constraints: mem=4G |
| 1391 | + options: |
| 1392 | + config-flags: "auto_assign_floating_ip=False" |
| 1393 | + enable-live-migration: False |
| 1394 | + enable-resize: False |
| 1395 | + nova-cloud-controller: |
| 1396 | + charm: nova-cloud-controller |
| 1397 | + constraints: mem=1G |
| 1398 | + num_units: 2 |
| 1399 | + options: |
| 1400 | + network-manager: Neutron |
| 1401 | + quantum-security-groups: "yes" |
| 1402 | + vip: 10.5.100.3 |
| 1403 | + ncc-hacluster: |
| 1404 | + charm: hacluster |
| 1405 | + neutron-gateway: |
| 1406 | + charm: neutron-gateway |
| 1407 | + constraints: mem=1G |
| 1408 | + num_units: 2 |
| 1409 | + options: |
| 1410 | + instance-mtu: 1350 |
| 1411 | + cinder: |
| 1412 | + charm: cinder |
| 1413 | + num_units: 2 |
| 1414 | + options: |
| 1415 | + block-device: "None" |
| 1416 | + glance-api-version: 2 |
| 1417 | + vip: 10.5.100.4 |
| 1418 | + constraints": mem=1G |
| 1419 | + cinder-hacluster: |
| 1420 | + charm: hacluster |
| 1421 | + cinder-ceph: |
| 1422 | + charm: cinder-ceph |
| 1423 | + glance: |
| 1424 | + charm: glance |
| 1425 | + constraints: mem=1G |
| 1426 | + num_units: 2 |
| 1427 | + options: |
| 1428 | + vip: 10.5.100.5 |
| 1429 | + glance-hacluster: |
| 1430 | + charm: hacluster |
| 1431 | + swift-proxy: |
| 1432 | + charm: swift-proxy |
| 1433 | + constraints: mem=1G |
| 1434 | + num_units: 2 |
| 1435 | + options: |
| 1436 | + zone-assignment: manual |
| 1437 | + replicas: 3 |
| 1438 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 1439 | + vip: 10.5.100.6 |
| 1440 | + swift-proxy-hacluster: |
| 1441 | + charm: hacluster |
| 1442 | + swift-storage-z1: |
| 1443 | + charm: swift-storage |
| 1444 | + constraints: mem=1G |
| 1445 | + options: |
| 1446 | + zone: 1 |
| 1447 | + block-device: vdb |
| 1448 | + overwrite: "true" |
| 1449 | + swift-storage-z2: |
| 1450 | + charm: swift-storage |
| 1451 | + constraints: mem=1G |
| 1452 | + options: |
| 1453 | + zone: 2 |
| 1454 | + block-device: vdb |
| 1455 | + overwrite: "true" |
| 1456 | + swift-storage-z3: |
| 1457 | + charm: swift-storage |
| 1458 | + constraints: mem=1G |
| 1459 | + options: |
| 1460 | + zone: 3 |
| 1461 | + block-device: vdb |
| 1462 | + overwrite: "true" |
| 1463 | +openstack-mysql-database: |
| 1464 | + inherits: openstack-services |
| 1465 | + services: |
| 1466 | + mysql: |
| 1467 | + charm: mysql |
| 1468 | + constraints: mem=1G |
| 1469 | + num_units: 2 |
| 1470 | + options: |
| 1471 | + vip: 10.5.100.10 |
| 1472 | + vip_cidr: 16 |
| 1473 | +openstack-percona-database: |
| 1474 | + inherits: openstack-services |
| 1475 | + services: |
| 1476 | + mysql: |
| 1477 | + charm: percona-cluster |
| 1478 | + constraints: mem=1G |
| 1479 | + num_units: 2 |
| 1480 | + options: |
| 1481 | + vip: 10.5.100.10 |
| 1482 | + vip_cidr: 16 |
| 1483 | + root-password: crapper |
| 1484 | + sst-password: crapper |
| 1485 | +openstack-neutron-api: |
| 1486 | + inherits: openstack-services |
| 1487 | + services: |
| 1488 | + neutron-api: |
| 1489 | + num_units: 2 |
| 1490 | + charm: neutron-api |
| 1491 | + constraints: mem=1G |
| 1492 | + options: |
| 1493 | + neutron-security-groups: True |
| 1494 | + vip: 10.5.108.1 |
| 1495 | + neutron-api-hacluster: |
| 1496 | + charm: hacluster |
| 1497 | + options: |
| 1498 | + corosync_mcastaddr: 226.94.1.8 |
| 1499 | + corosync_key: "JFgMRJhNfKnmBRGm+rbAwpZmd/1FX08SCzOzDg/teaVtfGf60QYBCrpRYQzjzM2f+iNpGFuYEW8fXd+Dvquns6E1v7JbSt7oPRi2DYfdXXHc3EYkhimPG7h/VvnhaabLQ5z8CuQzaVJL1Fp25n4Rs5V4d71sgE5IR0skkWC6YO8=" |
| 1500 | + neutron-openvswitch: |
| 1501 | + charm: neutron-openvswitch |
| 1502 | +precise-icehouse: |
| 1503 | + inherits: openstack-mysql-database |
| 1504 | + series: precise |
| 1505 | + overrides: |
| 1506 | + openstack-origin: cloud:precise-icehouse |
| 1507 | + source: cloud:precise-icehouse |
| 1508 | +trusty-icehouse: |
| 1509 | + inherits: |
| 1510 | + - openstack-neutron-api |
| 1511 | + - openstack-percona-database |
| 1512 | + series: trusty |
| 1513 | +# kilo |
| 1514 | +trusty-kilo: |
| 1515 | + inherits: |
| 1516 | + - openstack-neutron-api |
| 1517 | + - openstack-percona-database |
| 1518 | + series: trusty |
| 1519 | + overrides: |
| 1520 | + openstack-origin: cloud:trusty-kilo |
| 1521 | + source: cloud:trusty-kilo |
| 1522 | +trusty-kilo-proposed: |
| 1523 | + inherits: trusty-kilo |
| 1524 | + overrides: |
| 1525 | + openstack-origin: cloud:trusty-kilo/proposed |
| 1526 | + source: cloud:trusty-proposed/kilo |
| 1527 | +trusty-kilo-staging: |
| 1528 | + inherits: trusty-kilo |
| 1529 | + overrides: |
| 1530 | + openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging |
| 1531 | + source: ppa:ubuntu-cloud-archive/kilo-staging |
| 1532 | +# liberty |
| 1533 | +trusty-liberty: |
| 1534 | + inherits: |
| 1535 | + - openstack-neutron-api |
| 1536 | + - openstack-percona-database |
| 1537 | + series: trusty |
| 1538 | + overrides: |
| 1539 | + openstack-origin: cloud:trusty-liberty |
| 1540 | + source: cloud:trusty-liberty |
| 1541 | +trusty-liberty-proposed: |
| 1542 | + inherits: trusty-liberty |
| 1543 | + overrides: |
| 1544 | + openstack-origin: cloud:trusty-liberty/proposed |
| 1545 | + source: cloud:trusty-liberty/proposed |
| 1546 | +trusty-liberty-staging: |
| 1547 | + inherits: trusty-liberty |
| 1548 | + overrides: |
| 1549 | + openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
| 1550 | + source: ppa:ubuntu-cloud-archive/liberty-staging |
| 1551 | +wily-liberty: |
| 1552 | + inherits: |
| 1553 | + - openstack-neutron-api |
| 1554 | + - openstack-mysql-database |
| 1555 | + series: wily |
| 1556 | +wily-liberty-proposed: |
| 1557 | + inherits: wily-liberty |
| 1558 | + overrides: |
| 1559 | + source: proposed |
| 1560 | + openstack-origin: distro-proposed |
| 1561 | |
| 1562 | === renamed file 'helper/bundles/haphase2.yaml' => 'helper/bundles/haphase2-next.yaml' |
| 1563 | --- helper/bundles/haphase2.yaml 2016-04-08 14:00:41 +0000 |
| 1564 | +++ helper/bundles/haphase2-next.yaml 2016-04-12 03:41:29 +0000 |
| 1565 | @@ -50,8 +50,7 @@ |
| 1566 | constraints: mem=1G |
| 1567 | num_units: 2 |
| 1568 | options: |
| 1569 | - network-manager: Quantum |
| 1570 | - quantum-security-groups: "yes" |
| 1571 | + network-manager: Neutron |
| 1572 | vip: 10.5.100.3 |
| 1573 | ncc-hacluster: |
| 1574 | charm: hacluster |
| 1575 | |
| 1576 | === added file 'helper/bundles/haphase2.yaml' |
| 1577 | --- helper/bundles/haphase2.yaml 1970-01-01 00:00:00 +0000 |
| 1578 | +++ helper/bundles/haphase2.yaml 2016-04-12 03:41:29 +0000 |
| 1579 | @@ -0,0 +1,269 @@ |
| 1580 | +# vim: set ts=2 et: |
| 1581 | +# |
| 1582 | +# Config and topology for STABLE charms |
| 1583 | +# |
| 1584 | +openstack-services: |
| 1585 | + series: trusty |
| 1586 | + services: |
| 1587 | + mysql-hacluster: |
| 1588 | + charm: hacluster |
| 1589 | + rabbitmq-server: |
| 1590 | + charm: rabbitmq-server |
| 1591 | + constraints: mem=1G |
| 1592 | + num_units: 2 |
| 1593 | + ceph: |
| 1594 | + charm: ceph |
| 1595 | + num_units: 3 |
| 1596 | + constraints: mem=1G |
| 1597 | + options: |
| 1598 | + monitor-count: 3 |
| 1599 | + fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc |
| 1600 | + monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ== |
| 1601 | + osd-devices: /dev/vdb |
| 1602 | + osd-reformat: "yes" |
| 1603 | + ephemeral-unmount: /mnt |
| 1604 | + keystone: |
| 1605 | + charm: keystone |
| 1606 | + constraints: mem=1G |
| 1607 | + num_units: 2 |
| 1608 | + options: |
| 1609 | + admin-password: openstack |
| 1610 | + admin-token: ubuntutesting |
| 1611 | + vip: 10.5.100.1 |
| 1612 | + keystone-hacluster: |
| 1613 | + charm: hacluster |
| 1614 | + openstack-dashboard: |
| 1615 | + charm: openstack-dashboard |
| 1616 | + constraints: mem=1G |
| 1617 | + num_units: 2 |
| 1618 | + options: |
| 1619 | + vip: 10.5.100.2 |
| 1620 | + dashboard-hacluster: |
| 1621 | + charm: hacluster |
| 1622 | + nova-compute: |
| 1623 | + charm: nova-compute |
| 1624 | + num_units: 3 |
| 1625 | + constraints: mem=4G |
| 1626 | + options: |
| 1627 | + config-flags: "auto_assign_floating_ip=False" |
| 1628 | + enable-live-migration: False |
| 1629 | + enable-resize: False |
| 1630 | + nova-cloud-controller: |
| 1631 | + charm: nova-cloud-controller |
| 1632 | + constraints: mem=1G |
| 1633 | + num_units: 2 |
| 1634 | + options: |
| 1635 | + network-manager: Neutron |
| 1636 | + quantum-security-groups: "yes" |
| 1637 | + vip: 10.5.100.3 |
| 1638 | + ncc-hacluster: |
| 1639 | + charm: hacluster |
| 1640 | + neutron-gateway: |
| 1641 | + charm: neutron-gateway |
| 1642 | + constraints: mem=1G |
| 1643 | + num_units: 2 |
| 1644 | + options: |
| 1645 | + instance-mtu: 1350 |
| 1646 | + cinder: |
| 1647 | + charm: cinder |
| 1648 | + num_units: 2 |
| 1649 | + options: |
| 1650 | + block-device: "None" |
| 1651 | + glance-api-version: 2 |
| 1652 | + vip: 10.5.100.4 |
| 1653 | + constraints": mem=1G |
| 1654 | + cinder-hacluster: |
| 1655 | + charm: hacluster |
| 1656 | + cinder-ceph: |
| 1657 | + charm: cinder-ceph |
| 1658 | + glance: |
| 1659 | + charm: glance |
| 1660 | + constraints: mem=1G |
| 1661 | + num_units: 2 |
| 1662 | + options: |
| 1663 | + vip: 10.5.100.5 |
| 1664 | + glance-hacluster: |
| 1665 | + charm: hacluster |
| 1666 | + swift-proxy: |
| 1667 | + charm: swift-proxy |
| 1668 | + constraints: mem=1G |
| 1669 | + num_units: 2 |
| 1670 | + options: |
| 1671 | + zone-assignment: manual |
| 1672 | + replicas: 3 |
| 1673 | + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
| 1674 | + vip: 10.5.100.6 |
| 1675 | + swift-proxy-hacluster: |
| 1676 | + charm: hacluster |
| 1677 | + swift-storage-z1: |
| 1678 | + charm: swift-storage |
| 1679 | + constraints: mem=1G |
| 1680 | + options: |
| 1681 | + zone: 1 |
| 1682 | + block-device: vdb |
| 1683 | + overwrite: "true" |
| 1684 | + swift-storage-z2: |
| 1685 | + charm: swift-storage |
| 1686 | + constraints: mem=1G |
| 1687 | + options: |
| 1688 | + zone: 2 |
| 1689 | + block-device: vdb |
| 1690 | + overwrite: "true" |
| 1691 | + swift-storage-z3: |
| 1692 | + charm: swift-storage |
| 1693 | + constraints: mem=1G |
| 1694 | + options: |
| 1695 | + zone: 3 |
| 1696 | + block-device: vdb |
| 1697 | + overwrite: "true" |
| 1698 | + relations: |
| 1699 | + - [ keystone, keystone-hacluster ] |
| 1700 | + - [ nova-cloud-controller, ncc-hacluster ] |
| 1701 | + - [ nova-cloud-controller, rabbitmq-server ] |
| 1702 | + - [ nova-cloud-controller, glance ] |
| 1703 | + - [ nova-cloud-controller, keystone ] |
| 1704 | + - [ nova-compute, nova-cloud-controller ] |
| 1705 | + - - nova-compute |
| 1706 | + - rabbitmq-server:amqp |
| 1707 | + - [ nova-compute, glance ] |
| 1708 | + - [ nova-compute, ceph ] |
| 1709 | + - [ glance, glance-hacluster ] |
| 1710 | + - [ glance, keystone ] |
| 1711 | + - [ glance, ceph ] |
| 1712 | + - [ glance, cinder ] |
| 1713 | + - [ glance, rabbitmq-server ] |
| 1714 | + - [ cinder, cinder-hacluster ] |
| 1715 | + - [ cinder, rabbitmq-server ] |
| 1716 | + - [ cinder, nova-cloud-controller ] |
| 1717 | + - [ cinder, keystone ] |
| 1718 | + - [ cinder, cinder-ceph ] |
| 1719 | + - [ cinder-ceph, ceph ] |
| 1720 | + - [ neutron-gateway, nova-cloud-controller ] |
| 1721 | + - [ "neutron-gateway:amqp", rabbitmq-server ] |
| 1722 | + - [ openstack-dashboard, keystone ] |
| 1723 | + - [ openstack-dashboard, dashboard-hacluster ] |
| 1724 | + - [ swift-proxy, keystone ] |
| 1725 | + - [ swift-proxy, swift-proxy-hacluster ] |
| 1726 | + - [ swift-proxy, swift-storage-z1 ] |
| 1727 | + - [ swift-proxy, swift-storage-z2 ] |
| 1728 | + - [ swift-proxy, swift-storage-z3 ] |
| 1729 | +openstack-database-relations: |
| 1730 | + relations: |
| 1731 | + - [ mysql, mysql-hacluster ] |
| 1732 | + - [ keystone, mysql ] |
| 1733 | + - [ nova-cloud-controller, mysql ] |
| 1734 | + - [ nova-compute, mysql ] |
| 1735 | + - [ glance, mysql ] |
| 1736 | + - [ cinder, mysql ] |
| 1737 | +openstack-mysql-database: |
| 1738 | + inherits: |
| 1739 | + - openstack-services |
| 1740 | + - openstack-database-relations |
| 1741 | + services: |
| 1742 | + mysql: |
| 1743 | + charm: mysql |
| 1744 | + constraints: mem=1G |
| 1745 | + num_units: 2 |
| 1746 | + options: |
| 1747 | + vip: 10.5.100.10 |
| 1748 | + vip_cidr: 16 |
| 1749 | +openstack-percona-database: |
| 1750 | + inherits: |
| 1751 | + - openstack-services |
| 1752 | + - openstack-database-relations |
| 1753 | + services: |
| 1754 | + mysql: |
| 1755 | + charm: percona-cluster |
| 1756 | + constraints: mem=1G |
| 1757 | + num_units: 2 |
| 1758 | + options: |
| 1759 | + vip: 10.5.100.10 |
| 1760 | + vip_cidr: 16 |
| 1761 | + root-password: crapper |
| 1762 | + sst-password: crapper |
| 1763 | +openstack-neutron-api: |
| 1764 | + inherits: openstack-services |
| 1765 | + services: |
| 1766 | + neutron-api: |
| 1767 | + num_units: 2 |
| 1768 | + charm: neutron-api |
| 1769 | + constraints: mem=1G |
| 1770 | + options: |
| 1771 | + neutron-security-groups: True |
| 1772 | + vip: 10.5.108.1 |
| 1773 | + neutron-api-hacluster: |
| 1774 | + charm: hacluster |
| 1775 | + options: |
| 1776 | + corosync_mcastaddr: 226.94.1.8 |
| 1777 | + corosync_key: "JFgMRJhNfKnmBRGm+rbAwpZmd/1FX08SCzOzDg/teaVtfGf60QYBCrpRYQzjzM2f+iNpGFuYEW8fXd+Dvquns6E1v7JbSt7oPRi2DYfdXXHc3EYkhimPG7h/VvnhaabLQ5z8CuQzaVJL1Fp25n4Rs5V4d71sgE5IR0skkWC6YO8=" |
| 1778 | + neutron-openvswitch: |
| 1779 | + charm: neutron-openvswitch |
| 1780 | + relations: |
| 1781 | + - [ neutron-api, mysql ] |
| 1782 | + - [ neutron-api, rabbitmq-server ] |
| 1783 | + - [ neutron-api, nova-cloud-controller ] |
| 1784 | + - [ neutron-api, neutron-openvswitch ] |
| 1785 | + - [ neutron-api, keystone ] |
| 1786 | + - [ neutron-openvswitch, nova-compute ] |
| 1787 | + - [ neutron-openvswitch, rabbitmq-server ] |
| 1788 | + #hacluster relation |
| 1789 | + - [ neutron-api, neutron-api-hacluster ] |
| 1790 | +precise-icehouse: |
| 1791 | + inherits: openstack-mysql-database |
| 1792 | + series: precise |
| 1793 | + overrides: |
| 1794 | + openstack-origin: cloud:precise-icehouse |
| 1795 | + source: cloud:precise-icehouse |
| 1796 | +trusty-icehouse: |
| 1797 | + inherits: |
| 1798 | + - openstack-neutron-api |
| 1799 | + - openstack-percona-database |
| 1800 | + series: trusty |
| 1801 | +# kilo |
| 1802 | +trusty-kilo: |
| 1803 | + inherits: |
| 1804 | + - openstack-neutron-api |
| 1805 | + - openstack-percona-database |
| 1806 | + series: trusty |
| 1807 | + overrides: |
| 1808 | + openstack-origin: cloud:trusty-kilo |
| 1809 | + source: cloud:trusty-kilo |
| 1810 | +trusty-kilo-proposed: |
| 1811 | + inherits: trusty-kilo |
| 1812 | + overrides: |
| 1813 | + openstack-origin: cloud:trusty-kilo/proposed |
| 1814 | + source: cloud:trusty-proposed/kilo |
| 1815 | +trusty-kilo-staging: |
| 1816 | + inherits: trusty-kilo |
| 1817 | + overrides: |
| 1818 | + openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging |
| 1819 | + source: ppa:ubuntu-cloud-archive/kilo-staging |
| 1820 | +# liberty |
| 1821 | +trusty-liberty: |
| 1822 | + inherits: |
| 1823 | + - openstack-neutron-api |
| 1824 | + - openstack-percona-database |
| 1825 | + series: trusty |
| 1826 | + overrides: |
| 1827 | + openstack-origin: cloud:trusty-liberty |
| 1828 | + source: cloud:trusty-liberty |
| 1829 | +trusty-liberty-proposed: |
| 1830 | + inherits: trusty-liberty |
| 1831 | + overrides: |
| 1832 | + openstack-origin: cloud:trusty-liberty/proposed |
| 1833 | + source: cloud:trusty-liberty/proposed |
| 1834 | +trusty-liberty-staging: |
| 1835 | + inherits: trusty-liberty |
| 1836 | + overrides: |
| 1837 | + openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging |
| 1838 | + source: ppa:ubuntu-cloud-archive/liberty-staging |
| 1839 | +wily-liberty: |
| 1840 | + inherits: |
| 1841 | + - openstack-neutron-api |
| 1842 | + - openstack-mysql-database |
| 1843 | + series: wily |
| 1844 | +wily-liberty-proposed: |
| 1845 | + inherits: wily-liberty |
| 1846 | + overrides: |
| 1847 | + source: proposed |
| 1848 | + openstack-origin: distro-proposed |
| 1849 | |
| 1850 | === renamed file 'helper/bundles/ksv3_full.yaml' => 'helper/bundles/ksv3-full-next.yaml' |
| 1851 | --- helper/bundles/ksv3_full.yaml 2016-04-08 14:00:41 +0000 |
| 1852 | +++ helper/bundles/ksv3-full-next.yaml 2016-04-12 03:41:29 +0000 |
| 1853 | @@ -46,7 +46,6 @@ |
| 1854 | constraints: mem=1G |
| 1855 | options: |
| 1856 | network-manager: Neutron |
| 1857 | - quantum-security-groups: "yes" |
| 1858 | neutron-gateway: |
| 1859 | charm: neutron-gateway |
| 1860 | constraints: mem=1G |
| 1861 | |
| 1862 | === renamed file 'helper/bundles/minimal.yaml' => 'helper/bundles/minimal-next.yaml' |
| 1863 | --- helper/bundles/minimal.yaml 2016-04-08 14:00:41 +0000 |
| 1864 | +++ helper/bundles/minimal-next.yaml 2016-04-12 03:41:29 +0000 |
| 1865 | @@ -27,8 +27,7 @@ |
| 1866 | charm: nova-cloud-controller |
| 1867 | constraints: mem=1G |
| 1868 | options: |
| 1869 | - network-manager: Quantum |
| 1870 | - quantum-security-groups: "yes" |
| 1871 | + network-manager: Neutron |
| 1872 | neutron-gateway: |
| 1873 | charm: neutron-gateway |
| 1874 | constraints: mem=1G |
| 1875 | |
| 1876 | === modified file 'helper/bundles/next-ha.yaml' |
| 1877 | --- helper/bundles/next-ha.yaml 2016-04-08 14:00:41 +0000 |
| 1878 | +++ helper/bundles/next-ha.yaml 2016-04-12 03:41:29 +0000 |
| 1879 | @@ -71,8 +71,7 @@ |
| 1880 | charm: nova-cloud-controller |
| 1881 | constraints: mem=1G |
| 1882 | options: |
| 1883 | - network-manager: Quantum |
| 1884 | - quantum-security-groups: "yes" |
| 1885 | + network-manager: Neutron |
| 1886 | vip: 10.5.104.1 |
| 1887 | nova-cloud-controller-hacluster: |
| 1888 | charm: hacluster |
| 1889 | |
| 1890 | === modified file 'helper/scripts/check-lint.sh' |
| 1891 | --- helper/scripts/check-lint.sh 2015-07-30 14:47:50 +0000 |
| 1892 | +++ helper/scripts/check-lint.sh 2016-04-12 03:41:29 +0000 |
| 1893 | @@ -14,6 +14,26 @@ |
| 1894 | [[ -n "$MSGS" ]] && echo -e "$MSGS\n" |
| 1895 | done |
| 1896 | |
| 1897 | +# Keep bundle names consistent |
| 1898 | +bundle_names="$(ls -1 ./helper/bundles/*_*)" |
| 1899 | +if [[ -n "$bundle_names" ]]; then |
| 1900 | + echo -e "(!)\tFor consistency, bundle file names should not use underscores (hyphens are ok)." |
| 1901 | + failed=1 |
| 1902 | + echo "$bundle_names" |
| 1903 | +else |
| 1904 | + echo "Bundle file names OK" |
| 1905 | +fi |
| 1906 | + |
| 1907 | +# Keep spec dir names consistent |
| 1908 | +spec_dir_names="$(find ./specs -type d | grep -)" |
| 1909 | +if [[ -n "$spec_dir_names" ]]; then |
| 1910 | + echo -e "(!)\tFor consistency, spec dir names should not use hyphens (underscores are ok)." |
| 1911 | + failed=1 |
| 1912 | + echo "$spec_dir_names" |
| 1913 | +else |
| 1914 | + echo "Bundle file names OK" |
| 1915 | +fi |
| 1916 | + |
| 1917 | if [[ -n "$failed" ]]; then |
| 1918 | echo "One or more specs failed a sanity check." |
| 1919 | exit 1 |
| 1920 | |
| 1921 | === added directory 'specs/deprecated' |
| 1922 | === renamed directory 'specs/full_stack/next_ha_phased' => 'specs/deprecated/next_ha_phased' |
| 1923 | === renamed directory 'specs/full_stack/next_ha_phased_chaos_pony' => 'specs/deprecated/next_ha_phased_chaos_pony' |
| 1924 | === renamed directory 'specs/dev/bug1389670/percona-cluster' => 'specs/dev/bug1389670/percona_cluster' |
| 1925 | === modified file 'specs/dev/next_mini/mini.yaml' |
| 1926 | --- specs/dev/next_mini/mini.yaml 2016-04-05 03:19:47 +0000 |
| 1927 | +++ specs/dev/next_mini/mini.yaml 2016-04-12 03:41:29 +0000 |
| 1928 | @@ -27,8 +27,7 @@ |
| 1929 | charm: nova-cloud-controller |
| 1930 | constraints: mem=1G |
| 1931 | options: |
| 1932 | - network-manager: Quantum |
| 1933 | - quantum-security-groups: "yes" |
| 1934 | + network-manager: Neutron |
| 1935 | neutron-gateway: |
| 1936 | charm: neutron-gateway |
| 1937 | constraints: mem=1G |
| 1938 | |
| 1939 | === modified symlink 'specs/full_stack/next_charmhelper_sync/icehouse/full.yaml' |
| 1940 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1941 | === modified symlink 'specs/full_stack/next_charmhelper_sync/kilo/full.yaml' |
| 1942 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1943 | === modified symlink 'specs/full_stack/next_charmhelper_sync/liberty/full.yaml' |
| 1944 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1945 | === modified symlink 'specs/full_stack/next_charmhelper_sync/mitaka/full.yaml' |
| 1946 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1947 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/icehouse/haphase1.yaml' |
| 1948 | === target changed u'../../../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1-next.yaml' |
| 1949 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/icehouse/haphase2.yaml' |
| 1950 | === target changed u'../../../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2-next.yaml' |
| 1951 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/kilo/haphase1.yaml' |
| 1952 | === target changed u'../../../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1-next.yaml' |
| 1953 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/kilo/haphase2.yaml' |
| 1954 | === target changed u'../../../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2-next.yaml' |
| 1955 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/liberty/haphase1.yaml' |
| 1956 | === target changed u'../../../../helper/bundles/haphase1.yaml' => u'../../../../helper/bundles/haphase1-next.yaml' |
| 1957 | === modified symlink 'specs/full_stack/next_charmhelper_sync_ha/liberty/haphase2.yaml' |
| 1958 | === target changed u'../../../../helper/bundles/haphase2.yaml' => u'../../../../helper/bundles/haphase2-next.yaml' |
| 1959 | === modified symlink 'specs/full_stack/next_deploy/icehouse/full.yaml' |
| 1960 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1961 | === modified symlink 'specs/full_stack/next_deploy/kilo/full.yaml' |
| 1962 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1963 | === modified symlink 'specs/full_stack/next_deploy/liberty/full.yaml' |
| 1964 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1965 | === modified symlink 'specs/full_stack/next_deploy/mitaka/full.yaml' |
| 1966 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 1967 | === modified symlink 'specs/full_stack/next_deploy_baremetal/icehouse/baremetal7.yaml' |
| 1968 | === target changed u'../../../../helper/bundles/baremetal7.yaml' => u'../../../../helper/bundles/baremetal7-next.yaml' |
| 1969 | === modified symlink 'specs/full_stack/next_deploy_baremetal/kilo/baremetal7.yaml' |
| 1970 | === target changed u'../../../../helper/bundles/baremetal7.yaml' => u'../../../../helper/bundles/baremetal7-next.yaml' |
| 1971 | === modified symlink 'specs/full_stack/next_deploy_baremetal/liberty/baremetal7.yaml' |
| 1972 | === target changed u'../../../../helper/bundles/baremetal7.yaml' => u'../../../../helper/bundles/baremetal7-next.yaml' |
| 1973 | === modified symlink 'specs/full_stack/next_deploy_baremetal/mitaka/baremetal7.yaml' |
| 1974 | === target changed u'../../../../helper/bundles/baremetal7.yaml' => u'../../../../helper/bundles/baremetal7-next.yaml' |
| 1975 | === added symlink 'specs/full_stack/next_deploy_ssl/icehouse/full-ssl.yaml' |
| 1976 | === target is u'../../../../helper/bundles/full-ssl-next.yaml' |
| 1977 | === removed symlink 'specs/full_stack/next_deploy_ssl/icehouse/full_ssl.yaml' |
| 1978 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 1979 | === modified file 'specs/full_stack/next_deploy_ssl/icehouse/manifest' |
| 1980 | --- specs/full_stack/next_deploy_ssl/icehouse/manifest 2015-10-16 16:24:03 +0000 |
| 1981 | +++ specs/full_stack/next_deploy_ssl/icehouse/manifest 2016-04-12 03:41:29 +0000 |
| 1982 | @@ -2,7 +2,7 @@ |
| 1983 | collect config=collect-next-${MOJO_SERIES} |
| 1984 | |
| 1985 | # Use juju deployer with full.yaml bundle |
| 1986 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse |
| 1987 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse |
| 1988 | |
| 1989 | # Check juju statuses are green and that hooks have finished |
| 1990 | verify config=check_juju.py |
| 1991 | |
| 1992 | === added symlink 'specs/full_stack/next_deploy_ssl/kilo/full-ssl.yaml' |
| 1993 | === target is u'../../../../helper/bundles/full-ssl-next.yaml' |
| 1994 | === removed symlink 'specs/full_stack/next_deploy_ssl/kilo/full_ssl.yaml' |
| 1995 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 1996 | === modified file 'specs/full_stack/next_deploy_ssl/kilo/manifest' |
| 1997 | --- specs/full_stack/next_deploy_ssl/kilo/manifest 2015-10-16 16:24:03 +0000 |
| 1998 | +++ specs/full_stack/next_deploy_ssl/kilo/manifest 2016-04-12 03:41:29 +0000 |
| 1999 | @@ -2,7 +2,7 @@ |
| 2000 | collect config=collect-next-${MOJO_SERIES} |
| 2001 | |
| 2002 | # Use juju deployer with full.yaml bundle |
| 2003 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
| 2004 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
| 2005 | |
| 2006 | # Check juju statuses are green and that hooks have finished |
| 2007 | verify config=check_juju.py |
| 2008 | |
| 2009 | === added symlink 'specs/full_stack/next_deploy_ssl/liberty/full-ssl.yaml' |
| 2010 | === target is u'../../../../helper/bundles/full-ssl-next.yaml' |
| 2011 | === removed symlink 'specs/full_stack/next_deploy_ssl/liberty/full_ssl.yaml' |
| 2012 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 2013 | === modified file 'specs/full_stack/next_deploy_ssl/liberty/manifest' |
| 2014 | --- specs/full_stack/next_deploy_ssl/liberty/manifest 2015-10-16 16:24:03 +0000 |
| 2015 | +++ specs/full_stack/next_deploy_ssl/liberty/manifest 2016-04-12 03:41:29 +0000 |
| 2016 | @@ -2,7 +2,7 @@ |
| 2017 | collect config=collect-next-${MOJO_SERIES} |
| 2018 | |
| 2019 | # Use juju deployer with full.yaml bundle |
| 2020 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2021 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2022 | |
| 2023 | # Check juju statuses are green and that hooks have finished |
| 2024 | verify config=check_juju.py |
| 2025 | |
| 2026 | === added symlink 'specs/full_stack/next_dvr/kilo/full-dvr-next.yaml' |
| 2027 | === target is u'../../../../helper/bundles/full-dvr-next.yaml' |
| 2028 | === removed symlink 'specs/full_stack/next_dvr/kilo/full_dvr.yaml' |
| 2029 | === target was u'../../../../helper/bundles/full_dvr.yaml' |
| 2030 | === modified file 'specs/full_stack/next_dvr/kilo/manifest' |
| 2031 | --- specs/full_stack/next_dvr/kilo/manifest 2016-02-27 00:23:24 +0000 |
| 2032 | +++ specs/full_stack/next_dvr/kilo/manifest 2016-04-12 03:41:29 +0000 |
| 2033 | @@ -2,7 +2,7 @@ |
| 2034 | collect config=collect-next |
| 2035 | |
| 2036 | # Use juju deployer with full.yaml bundle |
| 2037 | -deploy config=full_dvr.yaml delay=0 target=${MOJO_SERIES}-kilo |
| 2038 | +deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-kilo |
| 2039 | |
| 2040 | # Check juju statuses are green and that hooks have finished |
| 2041 | verify config=check_juju.py |
| 2042 | |
| 2043 | === added symlink 'specs/full_stack/next_dvr/liberty/full-dvr-next.yaml' |
| 2044 | === target is u'../../../../helper/bundles/full-dvr-next.yaml' |
| 2045 | === removed symlink 'specs/full_stack/next_dvr/liberty/full_dvr.yaml' |
| 2046 | === target was u'../../../../helper/bundles/full_dvr.yaml' |
| 2047 | === modified file 'specs/full_stack/next_dvr/liberty/manifest' |
| 2048 | --- specs/full_stack/next_dvr/liberty/manifest 2016-02-27 00:23:24 +0000 |
| 2049 | +++ specs/full_stack/next_dvr/liberty/manifest 2016-04-12 03:41:29 +0000 |
| 2050 | @@ -2,7 +2,7 @@ |
| 2051 | collect config=collect-next |
| 2052 | |
| 2053 | # Use juju deployer with full.yaml bundle |
| 2054 | -deploy config=full_dvr.yaml delay=0 target=${MOJO_SERIES}-liberty |
| 2055 | +deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-liberty |
| 2056 | |
| 2057 | # Check juju statuses are green and that hooks have finished |
| 2058 | verify config=check_juju.py |
| 2059 | |
| 2060 | === added symlink 'specs/full_stack/next_dvr/mitaka/full-dvr-next.yaml' |
| 2061 | === target is u'../../../../helper/bundles/full-dvr-next.yaml' |
| 2062 | === removed symlink 'specs/full_stack/next_dvr/mitaka/full_dvr.yaml' |
| 2063 | === target was u'../../../../helper/bundles/full_dvr.yaml' |
| 2064 | === modified file 'specs/full_stack/next_dvr/mitaka/manifest' |
| 2065 | --- specs/full_stack/next_dvr/mitaka/manifest 2016-02-27 00:23:24 +0000 |
| 2066 | +++ specs/full_stack/next_dvr/mitaka/manifest 2016-04-12 03:41:29 +0000 |
| 2067 | @@ -2,7 +2,7 @@ |
| 2068 | collect config=collect-next |
| 2069 | |
| 2070 | # Use juju deployer with full.yaml bundle |
| 2071 | -deploy config=full_dvr.yaml delay=0 target=${MOJO_SERIES}-mitaka |
| 2072 | +deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-mitaka |
| 2073 | |
| 2074 | # Check juju statuses are green and that hooks have finished |
| 2075 | verify config=check_juju.py |
| 2076 | |
| 2077 | === modified symlink 'specs/full_stack/next_ha_oneshot/icehouse/ha.yaml' |
| 2078 | === target changed u'../../../../helper/bundles/ha.yaml' => u'../../../../helper/bundles/ha-next.yaml' |
| 2079 | === modified symlink 'specs/full_stack/next_ha_oneshot/kilo/ha.yaml' |
| 2080 | === target changed u'../../../../helper/bundles/ha.yaml' => u'../../../../helper/bundles/ha-next.yaml' |
| 2081 | === modified symlink 'specs/full_stack/next_ha_oneshot/liberty/ha.yaml' |
| 2082 | === target changed u'../../../../helper/bundles/ha.yaml' => u'../../../../helper/bundles/ha-next.yaml' |
| 2083 | === modified symlink 'specs/full_stack/next_ha_oneshot/mitaka/ha.yaml' |
| 2084 | === target changed u'../../../../helper/bundles/ha.yaml' => u'../../../../helper/bundles/ha-next.yaml' |
| 2085 | === added symlink 'specs/full_stack/next_ha_vrrp/kilo/full-vrrpha.yaml' |
| 2086 | === target is u'../../../../helper/bundles/full-vrrpha-next.yaml' |
| 2087 | === removed symlink 'specs/full_stack/next_ha_vrrp/kilo/full_vrrpha.yaml' |
| 2088 | === target was u'../../../../helper/bundles/full_vrrpha.yaml' |
| 2089 | === modified file 'specs/full_stack/next_ha_vrrp/kilo/manifest' |
| 2090 | --- specs/full_stack/next_ha_vrrp/kilo/manifest 2015-11-16 14:25:09 +0000 |
| 2091 | +++ specs/full_stack/next_ha_vrrp/kilo/manifest 2016-04-12 03:41:29 +0000 |
| 2092 | @@ -2,7 +2,7 @@ |
| 2093 | collect config=collect-next-ha |
| 2094 | |
| 2095 | # Use juju deployer with full.yaml bundle |
| 2096 | -deploy config=full_vrrpha.yaml delay=0 target=${MOJO_SERIES}-kilo |
| 2097 | +deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-kilo |
| 2098 | |
| 2099 | # Check juju statuses are green and that hooks have finished |
| 2100 | verify config=check_juju.py |
| 2101 | |
| 2102 | === added symlink 'specs/full_stack/next_ha_vrrp/liberty/full-vrrpha.yaml' |
| 2103 | === target is u'../../../../helper/bundles/full-vrrpha-next.yaml' |
| 2104 | === removed symlink 'specs/full_stack/next_ha_vrrp/liberty/full_vrrpha.yaml' |
| 2105 | === target was u'../../../../helper/bundles/full_vrrpha.yaml' |
| 2106 | === modified file 'specs/full_stack/next_ha_vrrp/liberty/manifest' |
| 2107 | --- specs/full_stack/next_ha_vrrp/liberty/manifest 2015-11-16 14:25:09 +0000 |
| 2108 | +++ specs/full_stack/next_ha_vrrp/liberty/manifest 2016-04-12 03:41:29 +0000 |
| 2109 | @@ -2,7 +2,7 @@ |
| 2110 | collect config=collect-next-ha |
| 2111 | |
| 2112 | # Use juju deployer with full.yaml bundle |
| 2113 | -deploy config=full_vrrpha.yaml delay=0 target=${MOJO_SERIES}-liberty |
| 2114 | +deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-liberty |
| 2115 | |
| 2116 | # Check juju statuses are green and that hooks have finished |
| 2117 | verify config=check_juju.py |
| 2118 | |
| 2119 | === added symlink 'specs/full_stack/next_keystone_v3/liberty/ksv3-full.yaml' |
| 2120 | === target is u'../../../../helper/bundles/ksv3-full-next.yaml' |
| 2121 | === removed symlink 'specs/full_stack/next_keystone_v3/liberty/ksv3_full.yaml' |
| 2122 | === target was u'../../../../helper/bundles/ksv3_full.yaml' |
| 2123 | === modified file 'specs/full_stack/next_keystone_v3/liberty/manifest' |
| 2124 | --- specs/full_stack/next_keystone_v3/liberty/manifest 2016-03-31 07:48:41 +0000 |
| 2125 | +++ specs/full_stack/next_keystone_v3/liberty/manifest 2016-04-12 03:41:29 +0000 |
| 2126 | @@ -2,7 +2,7 @@ |
| 2127 | collect config=collect-next-${MOJO_SERIES} |
| 2128 | |
| 2129 | # Use juju deployer with ksv3_full.yaml bundle |
| 2130 | -deploy config=ksv3_full.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2131 | +deploy config=ksv3-full.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2132 | |
| 2133 | # Check juju statuses are green and that hooks have finished |
| 2134 | verify config=check_juju.py |
| 2135 | |
| 2136 | === modified symlink 'specs/full_stack/next_openstack_upgrade/icehouse/full.yaml' |
| 2137 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 2138 | === modified symlink 'specs/full_stack/next_openstack_upgrade/kilo/full.yaml' |
| 2139 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 2140 | === modified symlink 'specs/full_stack/next_openstack_upgrade/liberty/full.yaml' |
| 2141 | === target changed u'../../../../helper/bundles/full.yaml' => u'../../../../helper/bundles/full-next.yaml' |
| 2142 | === added symlink 'specs/full_stack/stable_deploy_ssl/icehouse/full-ssl.yaml' |
| 2143 | === target is u'../../../../helper/bundles/full-ssl.yaml' |
| 2144 | === removed symlink 'specs/full_stack/stable_deploy_ssl/icehouse/full_ssl.yaml' |
| 2145 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 2146 | === modified file 'specs/full_stack/stable_deploy_ssl/icehouse/manifest' |
| 2147 | --- specs/full_stack/stable_deploy_ssl/icehouse/manifest 2015-10-20 03:06:15 +0000 |
| 2148 | +++ specs/full_stack/stable_deploy_ssl/icehouse/manifest 2016-04-12 03:41:29 +0000 |
| 2149 | @@ -2,7 +2,7 @@ |
| 2150 | collect config=collect-stable-${MOJO_SERIES} |
| 2151 | |
| 2152 | # Use juju deployer with full.yaml bundle |
| 2153 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse |
| 2154 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse |
| 2155 | |
| 2156 | # Check juju statuses are green and that hooks have finished |
| 2157 | verify config=check_juju.py |
| 2158 | |
| 2159 | === added symlink 'specs/full_stack/stable_deploy_ssl/kilo/full-ssl.yaml' |
| 2160 | === target is u'../../../../helper/bundles/full-ssl.yaml' |
| 2161 | === removed symlink 'specs/full_stack/stable_deploy_ssl/kilo/full_ssl.yaml' |
| 2162 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 2163 | === modified file 'specs/full_stack/stable_deploy_ssl/kilo/manifest' |
| 2164 | --- specs/full_stack/stable_deploy_ssl/kilo/manifest 2015-10-20 03:18:37 +0000 |
| 2165 | +++ specs/full_stack/stable_deploy_ssl/kilo/manifest 2016-04-12 03:41:29 +0000 |
| 2166 | @@ -2,7 +2,7 @@ |
| 2167 | collect config=collect-stable-${MOJO_SERIES} |
| 2168 | |
| 2169 | # Use juju deployer with full.yaml bundle |
| 2170 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
| 2171 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo |
| 2172 | |
| 2173 | # Check juju statuses are green and that hooks have finished |
| 2174 | verify config=check_juju.py |
| 2175 | |
| 2176 | === added symlink 'specs/full_stack/stable_deploy_ssl/liberty/full-ssl.yaml' |
| 2177 | === target is u'../../../../helper/bundles/full-ssl.yaml' |
| 2178 | === removed symlink 'specs/full_stack/stable_deploy_ssl/liberty/full_ssl.yaml' |
| 2179 | === target was u'../../../../helper/bundles/full_ssl.yaml' |
| 2180 | === modified file 'specs/full_stack/stable_deploy_ssl/liberty/manifest' |
| 2181 | --- specs/full_stack/stable_deploy_ssl/liberty/manifest 2015-10-20 03:18:37 +0000 |
| 2182 | +++ specs/full_stack/stable_deploy_ssl/liberty/manifest 2016-04-12 03:41:29 +0000 |
| 2183 | @@ -2,7 +2,7 @@ |
| 2184 | collect config=collect-stable-${MOJO_SERIES} |
| 2185 | |
| 2186 | # Use juju deployer with full.yaml bundle |
| 2187 | -deploy config=full_ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2188 | +deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty |
| 2189 | |
| 2190 | # Check juju statuses are green and that hooks have finished |
| 2191 | verify config=check_juju.py |
charm_lint_check #2241 mojo-openstack-
LINT OK: passed
Build: http://