Merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

[Chris MacNaughton]

[lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade]

336. By Chris MacNaughton on 2017-09-21

spec info updates and lint fixes

337. By Chris MacNaughton on 2017-09-21

syntax check for the test

338. By Chris MacNaughton on 2017-09-21

migrate ceph charms to charmstore

[Chris MacNaughton (chris.macnaughton)]

At the end of this spec, we have ceph-mon + ceph-osd :

Model Controller Cloud/Region Version SLA
icey icey-serverstack serverstack/serverstack 2.2.2 unsupported

App Version Status Scale Charm Store Rev OS Notes
ceph-mon 10.2.7 active 3 ceph-mon local 0 ubuntu
ceph-osd 10.2.7 active 6 ceph-osd local 15 ubuntu
ntp 4.2.8p4+dfsg active 6 ntp local 0 ubuntu

Unit Workload Agent Machine Public address Ports Message
ceph-mon/0* active idle 6 10.5.0.22 Unit is ready and clustered
ceph-mon/1 active idle 7 10.5.0.6 Unit is ready and clustered
ceph-mon/2 active idle 8 10.5.0.24 Unit is ready and clustered
ceph-osd/0* active idle 0 10.5.0.10 Unit is ready (1 OSD)
  ntp/1 active idle 10.5.0.10 123/udp Unit is ready
ceph-osd/1 active idle 1 10.5.0.9 Unit is ready (1 OSD)
  ntp/0* active executing 10.5.0.9 123/udp (update-status) Unit is ready
ceph-osd/2 active idle 2 10.5.0.28 Unit is ready (1 OSD)
  ntp/2 active idle 10.5.0.28 123/udp Unit is ready
ceph-osd/3 active idle 9 10.5.0.46 Unit is ready (1 OSD)
  ntp/3 active idle 10.5.0.46 123/udp Unit is ready
ceph-osd/4 active idle 10 10.5.0.49 Unit is ready (1 OSD)
  ntp/4 active idle 10.5.0.49 123/udp Unit is ready
ceph-osd/5 active idle 11 10.5.0.11 Unit is ready (1 OSD)
  ntp/5 active idle 10.5.0.11 123/udp Unit is ready

Machine State DNS Inst id Series AZ Message
0 started 10.5.0.10 050027ef-ba50-4974-90c5-eeeed901f742 xenial nova ACTIVE
1 started 10.5.0.9 2c86fed0-43ce-45ab-8fb7-c422a3453927 xenial nova ACTIVE
2 started 10.5.0.28 efd90b75-f39a-4a09-9a9b-5f5b4842413e xenial nova ACTIVE
6 started 10.5.0.22 085b71e1-fbd0-4b57-b199-acf1c12e095f xenial nova ACTIVE
7 started 10.5.0.6 e0769d30-0b85-4dd0-bf51-c09a5cd25b2b xenial nova ACTIVE
8 started 10.5.0.24 4ed91ac1-3e93-4a65-9bed-287f5208ea32 xenial nova ACTIVE
9 started 10.5.0.46 aa1d3f9d-25bf-46a1-92be-25720371ab59 xenial nova ACTIVE
10 started 10.5.0.49 17aaa991-cc1b-4040-8fd7-0bea88e3843d xenial nova ACTIVE
11 started 10.5.0.11 00d80a51-1c56-4d98-baf1-fe2a771164ff xenial nova ACTIVE

Relation provider Requirer Interface Type
ceph-mon:mon ceph-mon:mon ceph peer
ceph-mon:osd ceph-osd:mon ceph-osd regular
ceph-osd:juju-info ntp:juju-info juju-info subordinate
ntp:ntp-peers ntp:ntp-peers ntp peer

[Chris MacNaughton (chris.macnaughton)]

Some output from the mojo run: https://pastebin.ubuntu.com/25615994/

[Ryan Beisner (1chb1n)]

helper/setup/delete_application.py:19:1: E305 expected 2 blank lines after class or function definition, found 1

review: Needs Fixing

[lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade]

339. By Chris MacNaughton on 2017-09-25

style fix

[Ryan Beisner (1chb1n)]

Let's make some changes in naming for clarity. This is not a ceph upgrade. It is a charm migration.

So, instead of "specs/storage/ceph/upgrade" perhaps:

specs/storage/ceph/charm-migrate

Also update bundle names and other assets to suit. Thank you.

review: Needs Fixing

[lp:~chris.macnaughton/openstack-mojo-specs/ceph-upgrade]

340. By Chris MacNaughton on 2017-09-25

rename from upgrade to migration

341. By Chris MacNaughton on 2017-09-25

replace hyphen with underscore

=== added file 'helper/bundles/ceph-charm-migration.yaml'
--- helper/bundles/ceph-charm-migration.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/ceph-charm-migration.yaml	2017-09-25 19:22:27 +0000
@@ -0,0 +1,92 @@
+# This bundle is intended to closely resemble the ceph-base bundle from openstack-bundles.
+base:
+  relations:
+  - - ceph-osd:mon
+    - ceph-mon:osd
+  - - ceph:bootstrap-source
+    - ceph-mon:bootstrap-source
+  services:
+    ceph:
+      annotations:
+        gui-x: '750'
+        gui-y: '500'
+      charm: ceph
+      num_units: 3
+      options:
+        ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'no'
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+    ceph-mon:
+      annotations:
+        gui-x: '750'
+        gui-y: '500'
+      charm: ceph-mon
+      num_units: 3
+      options:
+        expected-osd-count: 6
+        no-bootstrap: True
+    ceph-osd:
+      annotations:
+        gui-x: '1000'
+        gui-y: '500'
+      charm: ceph-osd
+      num_units: 6
+      options:
+        ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'no'
+      to: ceph
+# icehouse
+trusty-icehouse:
+  inherits: base
+  series: trusty
+# kilo
+trusty-kilo:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-kilo
+# liberty
+trusty-liberty:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-liberty
+# mitaka
+trusty-mitaka:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-mitaka
+xenial-mitaka:
+  inherits: base
+  series: xenial
+# newton
+xenial-newton:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-newton
+yakkety-newton:
+  inherits: base
+  series: yakkety
+# ocata
+xenial-ocata:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: base
+  series: zesty
+# pike
+xenial-pike:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-pike
+artful-pike:
+  inherits: base
+  series: artful
 
=== added file 'helper/bundles/charm-ceph.yaml'
--- helper/bundles/charm-ceph.yaml	1970-01-01 00:00:00 +0000
+++ helper/bundles/charm-ceph.yaml	2017-09-25 19:22:27 +0000
@@ -0,0 +1,88 @@
+# This bundle is intended to closely resemble the ceph-base bundle from openstack-bundles.
+base:
+  relations:
+  - - ceph-osd:mon
+    - ceph:osd
+  - - ntp:juju-info
+    - ceph-osd:juju-info
+  services:
+    ceph:
+      annotations:
+        gui-x: '750'
+        gui-y: '500'
+      charm: ceph
+      num_units: 3
+      options:
+        ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+    ceph-osd:
+      annotations:
+        gui-x: '1000'
+        gui-y: '500'
+      charm: ceph-osd
+      num_units: 3
+      options:
+        ephemeral-unmount: /mnt
+        osd-devices: /dev/vdb /dev/sdb /dev/xvdb
+        osd-reformat: 'yes'
+    ntp:
+      annotations:
+        gui-x: '1000'
+        gui-y: '0'
+      charm: ntp
+      num_units: 0
+# icehouse
+trusty-icehouse:
+  inherits: base
+  series: trusty
+# kilo
+trusty-kilo:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-kilo
+# liberty
+trusty-liberty:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-liberty
+# mitaka
+trusty-mitaka:
+  inherits: base
+  series: trusty
+  overrides:
+    source: cloud:trusty-mitaka
+xenial-mitaka:
+  inherits: base
+  series: xenial
+# newton
+xenial-newton:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-newton
+yakkety-newton:
+  inherits: base
+  series: yakkety
+# ocata
+xenial-ocata:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: base
+  series: zesty
+# pike
+xenial-pike:
+  inherits: base
+  series: xenial
+  overrides:
+    source: cloud:xenial-pike
+artful-pike:
+  inherits: base
+  series: artful
 
=== modified file 'helper/collect/collect-ceph-default'
--- helper/collect/collect-ceph-default	2017-09-06 17:15:11 +0000
+++ helper/collect/collect-ceph-default	2017-09-25 19:22:27 +0000
@@ -1,3 +1,4 @@
-ceph-mon               git://github.com/openstack/charm-ceph-mon
-ceph-osd               git://github.com/openstack/charm-ceph-osd
+ceph                   cs:~openstack-charmers-next/ceph
+ceph-mon               cs:~openstack-charmers-next/ceph-mon
+ceph-osd               cs:~openstack-charmers-next/ceph-osd
 ntp                    git://git.launchpad.net/~thedac/ntp-charm;revno=zesty
 
=== added file 'helper/setup/delete_application.py'
--- helper/setup/delete_application.py	1970-01-01 00:00:00 +0000
+++ helper/setup/delete_application.py	2017-09-25 19:22:27 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+import sys
+import utils.mojo_utils as mojo_utils
+import logging
+import argparse
+
+
+def main(argv):
+    logging.basicConfig(level=logging.INFO)
+    parser = argparse.ArgumentParser()
+    parser.add_argument("application", nargs="*")
+    options = parser.parse_args()
+    unit_args = mojo_utils.parse_mojo_arg(
+        options,
+        'application', multiargs=True)
+    for application in unit_args:
+        mojo_utils.delete_application(application)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
=== modified file 'helper/tests/test_ceph_store.py'
--- helper/tests/test_ceph_store.py	2017-09-06 05:54:23 +0000
+++ helper/tests/test_ceph_store.py	2017-09-25 19:22:27 +0000
@@ -3,23 +3,40 @@
 import sys
 
 import utils.mojo_utils as mojo_utils
+import argparse
 
 
 def main(argv):
-    mojo_utils.remote_run(
-        'ceph-mon/0', 'ceph osd pool create rbd 128')
-    # Check
-    mojo_utils.remote_run('ceph-mon/0', 'echo 123456789 > /tmp/input.txt')
-    mojo_utils.remote_run(
-        'ceph-mon/0', 'rados put -p rbd test_input /tmp/input.txt')
-
-    # Check
-    mojo_utils.remote_run(
-        'ceph-mon/1', 'rados get -p rbd test_input /tmp/input.txt')
-    output = mojo_utils.remote_run('ceph-mon/1', 'cat /tmp/input.txt')
+    parser = argparse.ArgumentParser()
+    parser.add_argument("application",  default="ceph-mon", nargs="*")
+    parser.add_argument("units", default=[0, 1], nargs="*")
+    options = parser.parse_args()
+    application = mojo_utils.parse_mojo_arg(options,
+                                            'application', multiargs=False)
+    units = mojo_utils.parse_mojo_arg(options, 'units', multiargs=True)
+
+    mojo_utils.remote_run(
+        '{}/{}'.format(application, units[0]), 'ceph osd pool create rbd 128')
+    # Check
+    mojo_utils.remote_run(
+        '{}/{}'.format(application, units[0]),
+        'echo 123456789 > /tmp/input.txt')
+    mojo_utils.remote_run(
+        '{}/{}'.format(application, units[0]),
+        'rados put -p rbd test_input /tmp/input.txt')
+
+    # Check
+    mojo_utils.remote_run(
+        '{}/{}'.format(application, units[-1]),
+        'rados get -p rbd test_input /tmp/input.txt')
+    output = mojo_utils.remote_run(
+        '{}/{}'.format(application, units[-1]),
+        'cat /tmp/input.txt')
 
     # Cleanup
-    mojo_utils.remote_run('ceph-mon/2', 'rados rm -p rbd test_input')
+    mojo_utils.remote_run(
+        '{}/{}'.format(application, units[-1]),
+        'rados rm -p rbd test_input')
     if output[0].strip() != "123456789":
         sys.exit(1)
 
 
=== modified file 'helper/utils/kiki.py'
--- helper/utils/kiki.py	2017-09-05 22:27:05 +0000
+++ helper/utils/kiki.py	2017-09-25 19:22:27 +0000
@@ -251,6 +251,18 @@
 
 
 @cached
+def remove_application():
+    """Translate argument for remove-unit
+
+    @returns string Juju argument for remove-unit
+    """
+    if min_version('2.1'):
+        return "remove-application"
+    else:
+        return "remove-service"
+
+
+@cached
 def juju_state():
     """Translate identifier for juju-state
 
 
=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2017-09-25 18:51:44 +0000
+++ helper/utils/mojo_utils.py	2017-09-25 19:22:27 +0000
@@ -181,6 +181,12 @@
         delete_unit_provider(unit)
 
 
+def delete_application(application, wait=True):
+    logging.info('Removing application ' + application)
+    cmd = [kiki.cmd(), kiki.remove_application(), application]
+    subprocess.check_call(cmd)
+
+
 def delete_oldest(service, method='juju'):
     units = unit_sorted(get_juju_units(service=service))
     delete_unit(units[0], method='juju')
 
=== added directory 'specs/storage/ceph/charm_migration'
=== added directory 'specs/storage/ceph/charm_migration/icehouse'
=== added file 'specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/icehouse/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/icehouse/manifest'
--- specs/storage/ceph/charm_migration/icehouse/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/icehouse/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/icehouse/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/kilo'
=== added file 'specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/kilo/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/kilo/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/kilo/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/kilo/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/kilo/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/kilo/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/kilo/manifest'
--- specs/storage/ceph/charm_migration/kilo/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/kilo/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/kilo/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/kilo/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/liberty'
=== added file 'specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/liberty/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/liberty/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/liberty/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/liberty/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/liberty/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/liberty/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/liberty/manifest'
--- specs/storage/ceph/charm_migration/liberty/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/liberty/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/liberty/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/liberty/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/mitaka'
=== added file 'specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/mitaka/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/mitaka/manifest'
--- specs/storage/ceph/charm_migration/mitaka/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/mitaka/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/mitaka/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/newton'
=== added file 'specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/newton/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/newton/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/newton/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/newton/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/newton/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/newton/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/newton/manifest'
--- specs/storage/ceph/charm_migration/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/newton/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/newton/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/newton/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/ocata'
=== added file 'specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/ocata/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/ocata/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/ocata/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/ocata/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/ocata/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/ocata/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/ocata/manifest'
--- specs/storage/ceph/charm_migration/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/ocata/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/ocata/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/ocata/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/ceph/charm_migration/pike'
=== added file 'specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt'
--- specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/pike/SPEC_INFO.txt	2017-09-25 19:22:27 +0000
@@ -0,0 +1,4 @@
+This spec deploys a 3 monitor and 3 node OSD cluster. It tests to verify
+Rados can write to and read from the cluster. It deploys ceph-mon in addition
+to ceph, and then tears down ceph to verify that the cluster upgrade
+works.
 \ No newline at end of file
 
=== added symlink 'specs/storage/ceph/charm_migration/pike/ceph-charm-migration.yaml'
=== target is u'../../../../../helper/bundles/ceph-charm-migration.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/pike/charm-ceph.yaml'
=== target is u'../../../../../helper/bundles/charm-ceph.yaml'
=== added symlink 'specs/storage/ceph/charm_migration/pike/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/ceph/charm_migration/pike/collect-ceph-default'
=== target is u'../../../../../helper/collect/collect-ceph-default'
=== added symlink 'specs/storage/ceph/charm_migration/pike/delete_application.py'
=== target is u'../../../../../helper/setup/delete_application.py'
=== added file 'specs/storage/ceph/charm_migration/pike/manifest'
--- specs/storage/ceph/charm_migration/pike/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/ceph/charm_migration/pike/manifest	2017-09-25 19:22:27 +0000
@@ -0,0 +1,25 @@
+# Collect the charm branches from Launchpad
+collect config=collect-ceph-default
+
+# Use juju deployer with charm-ceph.yaml bundle
+deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
+
+# Use juju deployer with ceph-charm-migration.yaml bundle
+deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Remove charm-ceph from the deployment
+verify config=delete_application.py APPLICATION=ceph
+
+# Test obj store by sending and recieving files
+verify config=test_ceph_store.py APPLICATION=ceph-mon UNITS="0 1"
+
+# Success
 
=== added symlink 'specs/storage/ceph/charm_migration/pike/test_ceph_store.py'
=== target is u'../../../../../helper/tests/test_ceph_store.py'
=== added symlink 'specs/storage/ceph/charm_migration/pike/utils'
=== target is u'../../../../../helper/utils'