Merge lp:~james-page/charms/bundles/openstack-telemetry/bundle into lp:~charmers/charms/bundles/openstack-telemetry/bundle

[James Page]

[Liam Young (gnuoy)]

I haven't deployed from the bundle but it looks good to me

review: Approve

[lp:~james-page/charms/bundles/openstack-telemetry/bundle]

33. By James Page on 2015-11-18

Fixup reference to base bundle

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1455/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1440/

review: Needs Fixing (automated testing)

=== modified file 'README.md'
--- README.md	2015-02-20 15:46:25 +0000
+++ README.md	2015-11-18 11:22:44 +0000
@@ -8,4 +8,4 @@
 
     juju quickstart bundle:openstack-telemetry/openstack-telemetry
 
-[Basic OpenStack Cloud]: http://jujucharms.com/openstack
+[Basic OpenStack Cloud]: http://jujucharms.com/openstack-base

=== added file 'bundle.yaml'
--- bundle.yaml	1970-01-01 00:00:00 +0000
+++ bundle.yaml	2015-11-18 11:22:44 +0000
@@ -0,0 +1,297 @@
+machines:
+  '0':
+    constraints: arch=amd64
+    series: trusty
+  '1':
+    constraints: arch=amd64
+    series: trusty
+  '2':
+    constraints: arch=amd64
+    series: trusty
+  '3':
+    constraints: arch=amd64
+    series: trusty
+relations:
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+- - neutron-gateway:amqp
+  - rabbitmq-server:amqp
+- - keystone:shared-db
+  - mysql:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-openvswitch:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - neutron-api:shared-db
+  - mysql:shared-db
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - neutron-gateway:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-compute:image-service
+  - glance:image-service
+- - nova-cloud-controller:cloud-compute
+  - nova-compute:cloud-compute
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:quantum-network-service
+  - neutron-gateway:quantum-network-service
+- - nova-compute:neutron-plugin
+  - neutron-openvswitch:neutron-plugin
+- - neutron-openvswitch:amqp
+  - rabbitmq-server:amqp
+- - openstack-dashboard:identity-service
+  - keystone:identity-service
+- - nova-cloud-controller:shared-db
+  - mysql:shared-db
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - cinder:image-service
+  - glance:image-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:cinder-volume-service
+  - nova-cloud-controller:cinder-volume-service
+- - cinder-ceph:storage-backend
+  - cinder:storage-backend
+- - ceph:client
+  - nova-compute:ceph
+- - cinder:shared-db
+  - mysql:shared-db
+- - ceph:client
+  - cinder-ceph:ceph
+- - ceph:client
+  - glance:ceph
+- - ceph-osd:mon
+  - ceph:osd
+- - ntp:juju-info
+  - nova-compute:juju-info
+- - ntp:juju-info
+  - neutron-gateway:juju-info
+- - ceph-radosgw:mon
+  - ceph:radosgw
+- - ceph-radosgw:identity-service
+  - keystone:identity-service
+- - ceilometer:amqp
+  - rabbitmq-server:amqp
+- - ceilometer-agent:ceilometer-service
+  - ceilometer:ceilometer-service
+- - ceilometer:identity-service
+  - keystone:identity-service
+- - ceilometer:identity-notifications
+  - keystone:identity-notifications
+- - ceilometer-agent:nova-ceilometer
+  - nova-compute:nova-ceilometer
+- - ceilometer:shared-db
+  - mongodb:database
+series: trusty
+services:
+  ceilometer:
+    annotations:
+      gui-x: '1288.8744298356794'
+      gui-y: '0.7040786325134718'
+    charm: cs:trusty/ceilometer-15
+    num_units: 1
+    options:
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:2
+  ceilometer-agent:
+    annotations:
+      gui-x: '1288.9999389648438'
+      gui-y: '503'
+    charm: cs:trusty/ceilometer-agent-11
+  ceph:
+    annotations:
+      gui-x: '750'
+      gui-y: '500'
+    charm: cs:trusty/ceph-42
+    num_units: 3
+    options:
+      fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+      monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+      osd-devices: /dev/sdb
+      osd-reformat: 'yes'
+      source: cloud:trusty-liberty
+    to:
+    - '1'
+    - '2'
+    - '3'
+  ceph-osd:
+    annotations:
+      gui-x: '1000'
+      gui-y: '500'
+    charm: cs:trusty/ceph-osd-14
+    num_units: 1
+    options:
+      osd-devices: /dev/sdb
+      osd-reformat: 'yes'
+      source: cloud:trusty-liberty
+    to:
+    - '0'
+  ceph-radosgw:
+    annotations:
+      gui-x: '1000'
+      gui-y: '250'
+    charm: cs:trusty/ceph-radosgw-18
+    num_units: 1
+    options:
+      source: cloud:trusty-liberty
+      use-embedded-webserver: true
+    to:
+    - lxc:0
+  cinder:
+    annotations:
+      gui-x: '750'
+      gui-y: '0'
+    charm: cs:trusty/cinder-31
+    num_units: 1
+    options:
+      block-device: None
+      glance-api-version: 2
+      ha-mcastport: 5401
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:1
+  cinder-ceph:
+    annotations:
+      gui-x: '750'
+      gui-y: '250'
+    charm: cs:trusty/cinder-ceph-14
+    num_units: 0
+  glance:
+    annotations:
+      gui-x: '250'
+      gui-y: '0'
+    charm: cs:trusty/glance-28
+    num_units: 1
+    options:
+      ha-mcastport: 5402
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:2
+  keystone:
+    annotations:
+      gui-x: '500'
+      gui-y: '0'
+    charm: cs:trusty/keystone-31
+    num_units: 1
+    options:
+      admin-password: openstack
+      ha-mcastport: 5403
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:3
+  mongodb:
+    annotations:
+      gui-x: '1287.9999389648438'
+      gui-y: '251.24996948242188'
+    charm: cs:trusty/mongodb-28
+    num_units: 1
+    to:
+    - lxc:1
+  mysql:
+    annotations:
+      gui-x: '0'
+      gui-y: '250'
+    charm: cs:trusty/percona-cluster-31
+    num_units: 1
+    options:
+      max-connections: 20000
+    to:
+    - lxc:0
+  neutron-api:
+    annotations:
+      gui-x: '500'
+      gui-y: '500'
+    charm: cs:trusty/neutron-api-21
+    num_units: 1
+    options:
+      neutron-security-groups: true
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:1
+  neutron-gateway:
+    annotations:
+      gui-x: '0'
+      gui-y: '0'
+    charm: cs:trusty/neutron-gateway-7
+    num_units: 1
+    options:
+      ext-port: eth1
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - '0'
+  neutron-openvswitch:
+    annotations:
+      gui-x: '250'
+      gui-y: '500'
+    charm: cs:trusty/neutron-openvswitch-13
+    num_units: 0
+  nova-cloud-controller:
+    annotations:
+      gui-x: '0'
+      gui-y: '500'
+    charm: cs:trusty/nova-cloud-controller-64
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: cloud:trusty-liberty
+      quantum-security-groups: 'yes'
+    to:
+    - lxc:2
+  nova-compute:
+    annotations:
+      gui-x: '250'
+      gui-y: '250'
+    charm: cs:trusty/nova-compute-33
+    num_units: 3
+    options:
+      enable-live-migration: true
+      enable-resize: true
+      manage-neutron-plugin-legacy-mode: false
+      migration-auth-type: ssh
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - '1'
+    - '2'
+    - '3'
+  ntp:
+    annotations:
+      gui-x: '1000'
+      gui-y: '0'
+    charm: cs:trusty/ntp-14
+    num_units: 0
+  openstack-dashboard:
+    annotations:
+      gui-x: '500'
+      gui-y: '-250'
+    charm: cs:trusty/openstack-dashboard-19
+    num_units: 1
+    options:
+      openstack-origin: cloud:trusty-liberty
+    to:
+    - lxc:3
+  rabbitmq-server:
+    annotations:
+      gui-x: '500'
+      gui-y: '250'
+    charm: cs:trusty/rabbitmq-server-42
+    num_units: 1
+    options:
+      source: cloud:trusty-liberty
+    to:
+    - lxc:0
+

=== removed file 'bundles.yaml'
--- bundles.yaml	2015-02-20 16:26:27 +0000
+++ bundles.yaml	1970-01-01 00:00:00 +0000
@@ -1,277 +0,0 @@
-openstack-telemetry: 
-  services: 
-    "cinder-ceph": 
-      charm: "cs:trusty/cinder-ceph-4"
-      num_units: 0
-      annotations: 
-        "gui-x": "750"
-        "gui-y": "250"
-    ntp: 
-      charm: "cs:trusty/ntp-6"
-      num_units: 0
-      annotations: 
-        "gui-x": "1000"
-        "gui-y": "0"
-    "ceph-radosgw": 
-      charm: "cs:trusty/ceph-radosgw-9"
-      num_units: 1
-      options: 
-        source: "cloud:trusty-juno"
-        "use-embedded-webserver": true
-      annotations: 
-        "gui-x": "1000"
-        "gui-y": "250"
-      to: 
-        - "lxc:ceph=1"
-    "openstack-dashboard": 
-      charm: "cs:trusty/openstack-dashboard-8"
-      num_units: 1
-      options: 
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "500"
-        "gui-y": "-250"
-      to: 
-        - "lxc:ceph=1"
-    "neutron-gateway": 
-      charm: "cs:trusty/quantum-gateway-10"
-      num_units: 1
-      options: 
-        "ext-port": eth1
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "0"
-        "gui-y": "0"
-      to: 
-        - "juju-gui=0"
-    cinder: 
-      charm: "cs:trusty/cinder-12"
-      num_units: 1
-      options: 
-        "block-device": None
-        "glance-api-version": 2
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "750"
-        "gui-y": "0"
-      to: 
-        - "lxc:ceph=2"
-    glance: 
-      charm: "cs:trusty/glance-11"
-      num_units: 1
-      options: 
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "250"
-        "gui-y": "0"
-      to: 
-        - "lxc:ceph=1"
-    keystone: 
-      charm: "cs:trusty/keystone-14"
-      num_units: 1
-      options: 
-        "admin-password": openstack
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "500"
-        "gui-y": "0"
-      to: 
-        - "lxc:ceph=0"
-    "nova-compute": 
-      charm: "cs:trusty/nova-compute-14"
-      num_units: 3
-      options: 
-        "enable-live-migration": true
-        "enable-resize": true
-        "migration-auth-type": ssh
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "250"
-        "gui-y": "250"
-      to: 
-        - ceph=0
-        - ceph=1
-        - ceph=2
-    "neutron-api": 
-      charm: "cs:trusty/neutron-api-7"
-      num_units: 1
-      options: 
-        "neutron-security-groups": true
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "500"
-        "gui-y": "500"
-      to: 
-        - "lxc:ceph=0"
-    "neutron-openvswitch": 
-      charm: "cs:trusty/neutron-openvswitch-2"
-      num_units: 0
-      annotations: 
-        "gui-x": "250"
-        "gui-y": "500"
-    ceph: 
-      charm: "cs:trusty/ceph-34"
-      num_units: 3
-      options: 
-        fsid: "5a791d94-980b-11e4-b6f6-3c970e8b1cf7"
-        "monitor-secret": AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        "osd-devices": /dev/sdb
-        "osd-reformat": "yes"
-        source: "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "750"
-        "gui-y": "500"
-    "ceph-osd": 
-      charm: "cs:trusty/ceph-osd-8"
-      num_units: 1
-      options: 
-        "osd-devices": /dev/sdb
-        "osd-reformat": "yes"
-        source: "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "1000"
-        "gui-y": "500"
-      to: 
-        - "juju-gui=0"
-    mysql: 
-      charm: "cs:trusty/mysql-18"
-      num_units: 1
-      options: 
-        "max-connections": 20000
-      annotations: 
-        "gui-x": "0"
-        "gui-y": "250"
-      to: 
-        - "lxc:juju-gui=0"
-    "rabbitmq-server": 
-      charm: "cs:trusty/rabbitmq-server-26"
-      num_units: 1
-      annotations: 
-        "gui-x": "500"
-        "gui-y": "250"
-      to: 
-        - "lxc:juju-gui=0"
-    "nova-cloud-controller": 
-      charm: "cs:trusty/nova-cloud-controller-51"
-      num_units: 1
-      options: 
-        "network-manager": Neutron
-        "openstack-origin": "cloud:trusty-juno"
-        "quantum-security-groups": "yes"
-      annotations: 
-        "gui-x": "0"
-        "gui-y": "500"
-      to: 
-        - "lxc:ceph=2"
-    ceilometer: 
-      charm: "cs:trusty/ceilometer-3"
-      num_units: 1
-      options: 
-        "openstack-origin": "cloud:trusty-juno"
-      annotations: 
-        "gui-x": "1288.8744298356794"
-        "gui-y": "0.7040786325134718"
-      to: 
-        - "lxc:ceph=2"
-    "ceilometer-agent": 
-      charm: "cs:trusty/ceilometer-agent-3"
-      num_units: 0
-      annotations: 
-        "gui-x": "1288.9999389648438"
-        "gui-y": "503"
-    mongodb: 
-      charm: "cs:trusty/mongodb-16"
-      num_units: 1
-      annotations: 
-        "gui-x": "1287.9999389648438"
-        "gui-y": "251.24996948242188"
-      to: 
-        - "lxc:ceph=0"
-  relations: 
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:amqp"
-      - "rabbitmq-server:amqp"
-    - - "keystone:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:identity-service"
-      - "keystone:identity-service"
-    - - "glance:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-api:identity-service"
-      - "keystone:identity-service"
-    - - "neutron-openvswitch:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "neutron-api:shared-db"
-      - "mysql:shared-db"
-    - - "neutron-api:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:neutron-plugin-api"
-      - "neutron-api:neutron-plugin-api"
-    - - "glance:shared-db"
-      - "mysql:shared-db"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:quantum-network-service"
-      - "neutron-gateway:quantum-network-service"
-    - - "nova-compute:neutron-plugin"
-      - "neutron-openvswitch:neutron-plugin"
-    - - "neutron-openvswitch:amqp"
-      - "rabbitmq-server:amqp"
-    - - "openstack-dashboard:identity-service"
-      - "keystone:identity-service"
-    - - "nova-cloud-controller:shared-db"
-      - "mysql:shared-db"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "cinder:image-service"
-      - "glance:image-service"
-    - - "cinder:amqp"
-      - "rabbitmq-server:amqp"
-    - - "cinder:identity-service"
-      - "keystone:identity-service"
-    - - "cinder:cinder-volume-service"
-      - "nova-cloud-controller:cinder-volume-service"
-    - - "cinder-ceph:storage-backend"
-      - "cinder:storage-backend"
-    - - "ceph:client"
-      - "nova-compute:ceph"
-    - - "cinder:shared-db"
-      - "mysql:shared-db"
-    - - "ceph:client"
-      - "cinder-ceph:ceph"
-    - - "ceph:client"
-      - "glance:ceph"
-    - - "ceph-osd:mon"
-      - "ceph:osd"
-    - - "ntp:juju-info"
-      - "nova-compute:juju-info"
-    - - "ntp:juju-info"
-      - "neutron-gateway:juju-info"
-    - - "ntp:juju-info"
-      - "ceph-osd:juju-info"
-    - - "ceph-radosgw:mon"
-      - "ceph:radosgw"
-    - - "ceph-radosgw:identity-service"
-      - "keystone:identity-service"
-    - - "ceilometer:amqp"
-      - "rabbitmq-server:amqp"
-    - - "ceilometer-agent:ceilometer-service"
-      - "ceilometer:ceilometer-service"
-    - - "ceilometer:identity-service"
-      - "keystone:identity-service"
-    - - "ceilometer:identity-notifications"
-      - "keystone:identity-notifications"
-    - - "ceilometer-agent:nova-ceilometer"
-      - "nova-compute:nova-ceilometer"
-    - - "ceilometer:shared-db"
-      - "mongodb:database"
-  series: trusty