Merge lp:~gnuoy/openstack-mojo-specs/swift-spec-fixes into lp:openstack-mojo-specs

[Liam Young]

[Chris MacNaughton (chris.macnaughton)]

Looks good to me, merging

review: Approve

=== modified file 'helper/bundles/swift-ha-proxy-phase1.yaml'
--- helper/bundles/swift-ha-proxy-phase1.yaml	2017-09-11 15:47:30 +0000
+++ helper/bundles/swift-ha-proxy-phase1.yaml	2017-11-23 13:55:35 +0000
@@ -27,21 +27,21 @@
         swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
         disable-ring-balance: False
     swift-storage-z1:
-      charm: swift-storage-z1
+      charm: swift-storage
       constraints: mem=1G
       options:
         zone: 1
         block-device: vdb
         overwrite: "true"
     swift-storage-z2:
-      charm: swift-storage-z2
+      charm: swift-storage
       constraints: mem=1G
       options:
         zone: 2
         block-device: vdb
         overwrite: "true"
     swift-storage-z3:
-      charm: swift-storage-z3
+      charm: swift-storage
       constraints: mem=1G
       options:
         zone: 3
@@ -56,6 +56,8 @@
     - [ keystone, mysql ]
     - [ glance, mysql ]
     - [ glance, keystone ]
+    - [ glance, swift-proxy ]
+    - [ swift-proxy, keystone ]
     - [ swift-proxy, swift-hacluster ]
     - [ swift-proxy, swift-storage-z1 ]
     - [ swift-proxy, swift-storage-z2 ]
@@ -101,3 +103,15 @@
     ha-bindiface: ens2
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
+xenial-pike:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    ha-bindiface: ens2
+    openstack-origin: cloud:xenial-pike
+    source: cloud:xenial-pike
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty
+  overrides:
+    ha-bindiface: ens2
 
=== modified file 'helper/bundles/swift-ha-proxy-phase2.yaml'
--- helper/bundles/swift-ha-proxy-phase2.yaml	2017-09-05 21:37:34 +0000
+++ helper/bundles/swift-ha-proxy-phase2.yaml	2017-11-23 13:55:35 +0000
@@ -11,11 +11,11 @@
     swift-proxy:
       charm: swift-proxy
     swift-storage-z1:
-      charm: swift-storage-z1
+      charm: swift-storage
     swift-storage-z2:
-      charm: swift-storage-z2
+      charm: swift-storage
     swift-storage-z3:
-      charm: swift-storage-z3
+      charm: swift-storage
     swift-hacluster:
       charm: hacluster
   relations:
@@ -65,3 +65,15 @@
     ha-bindiface: ens2
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
+xenial-pike:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    ha-bindiface: ens2
+    openstack-origin: cloud:xenial-pike
+    source: cloud:xenial-pike
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty
+  overrides:
+    ha-bindiface: ens2
 
=== modified file 'helper/collect/collect-next-swift-proxy'
--- helper/collect/collect-next-swift-proxy	2017-09-06 14:46:47 +0000
+++ helper/collect/collect-next-swift-proxy	2017-11-23 13:55:35 +0000
@@ -3,6 +3,4 @@
 keystone               cs:~openstack-charmers-next/keystone
 mysql                  cs:~openstack-charmers-next/percona-cluster
 swift-proxy            cs:~openstack-charmers-next/swift-proxy
-swift-storage-z1       cs:~openstack-charmers-next/swift-storage
-swift-storage-z2       cs:~openstack-charmers-next/swift-storage
-swift-storage-z3       cs:~openstack-charmers-next/swift-storage
+swift-storage          cs:~openstack-charmers-next/swift-storage
 
=== modified file 'helper/scripts/check-lint.sh'
--- helper/scripts/check-lint.sh	2016-04-18 14:36:47 +0000
+++ helper/scripts/check-lint.sh	2017-11-23 13:55:35 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Checking specs..."
-for spec in $(find specs/{object_storage,full_stack} -name manifest); do
+for spec in $(find specs/{storage,full_stack} -name manifest); do
     spec_dir=$(dirname $spec)
     MSGS=$(./helper/scripts/mojo-spec-check.py $spec_dir 2>&1)
     if [[ "$MSGS" == *WARNING* ]] || [[ "$MSGS" == *ERROR* ]]; then
 
=== modified file 'helper/setup/juju_set.py'
--- helper/setup/juju_set.py	2017-08-30 17:25:03 +0000
+++ helper/setup/juju_set.py	2017-11-23 13:55:35 +0000
@@ -8,12 +8,18 @@
     parser = argparse.ArgumentParser()
     parser.add_argument("--service")
     parser.add_argument("--kv")
+    parser.add_argument("--wait")
     options = parser.parse_args()
     service = mojo_utils.parse_mojo_arg(options, 'service')
     kv = mojo_utils.parse_mojo_arg(options, 'kv')
+    wait = mojo_utils.parse_mojo_arg(options, 'wait')
+    print("Wait: {}".format(wait))
+    if wait is not None:
+        wait = wait == 'True'
     print("Service: {}".format(service))
     print("Option: {}".format(kv))
-    mojo_utils.juju_set(service, kv)
+    print("Wait: {}".format(wait))
+    mojo_utils.juju_set(service, kv, wait=wait)
 
 
 if __name__ == "__main__":
 
=== added symlink 'specs/storage/swift/ha_serial_scaleout/icehouse/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== modified file 'specs/storage/swift/ha_serial_scaleout/icehouse/manifest'
--- specs/storage/swift/ha_serial_scaleout/icehouse/manifest	2016-10-13 15:30:54 +0000
+++ specs/storage/swift/ha_serial_scaleout/icehouse/manifest	2017-11-23 13:55:35 +0000
@@ -7,12 +7,6 @@
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
-# Add service relations
-deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
-
-# Check juju statuses are green and that hooks have finished
-verify config=check_juju.py
-
 # Setup glance images
 script config=image_setup.py
 
@@ -25,6 +19,9 @@
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py
 
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
 # Add a swift-proxy unit
 script config=add_unit.py UNITS='swift-proxy:1'
 
 
=== removed symlink 'specs/storage/swift/ha_serial_scaleout/icehouse/swift-ha-proxy-phase2.yaml'
=== target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/kilo/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== modified file 'specs/storage/swift/ha_serial_scaleout/kilo/manifest'
--- specs/storage/swift/ha_serial_scaleout/kilo/manifest	2016-10-13 15:30:54 +0000
+++ specs/storage/swift/ha_serial_scaleout/kilo/manifest	2017-11-23 13:55:35 +0000
@@ -7,12 +7,6 @@
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
-# Add service relations
-deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
-
-# Check juju statuses are green and that hooks have finished
-verify config=check_juju.py
-
 # Setup glance images
 script config=image_setup.py
 
@@ -25,6 +19,9 @@
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py
 
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
 # Add a swift-proxy unit
 script config=add_unit.py UNITS='swift-proxy:1'
 
 
=== removed symlink 'specs/storage/swift/ha_serial_scaleout/kilo/swift-ha-proxy-phase2.yaml'
=== target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/liberty/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== modified file 'specs/storage/swift/ha_serial_scaleout/liberty/manifest'
--- specs/storage/swift/ha_serial_scaleout/liberty/manifest	2016-10-13 15:30:54 +0000
+++ specs/storage/swift/ha_serial_scaleout/liberty/manifest	2017-11-23 13:55:35 +0000
@@ -7,12 +7,6 @@
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
-# Add service relations
-deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
-
-# Check juju statuses are green and that hooks have finished
-verify config=check_juju.py
-
 # Setup glance images
 script config=image_setup.py
 
@@ -25,6 +19,9 @@
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py
 
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
 # Add a swift-proxy unit
 script config=add_unit.py UNITS='swift-proxy:1'
 
 
=== removed symlink 'specs/storage/swift/ha_serial_scaleout/liberty/swift-ha-proxy-phase2.yaml'
=== target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/mitaka/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== modified file 'specs/storage/swift/ha_serial_scaleout/mitaka/manifest'
--- specs/storage/swift/ha_serial_scaleout/mitaka/manifest	2016-10-13 15:30:54 +0000
+++ specs/storage/swift/ha_serial_scaleout/mitaka/manifest	2017-11-23 13:55:35 +0000
@@ -7,12 +7,6 @@
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
-# Add service relations
-deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
-
-# Check juju statuses are green and that hooks have finished
-verify config=check_juju.py
-
 # Setup glance images
 script config=image_setup.py
 
@@ -25,6 +19,9 @@
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py
 
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
 # Add a swift-proxy unit
 script config=add_unit.py UNITS='swift-proxy:1'
 
 
=== removed symlink 'specs/storage/swift/ha_serial_scaleout/mitaka/swift-ha-proxy-phase2.yaml'
=== target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/newton/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== modified file 'specs/storage/swift/ha_serial_scaleout/newton/manifest'
--- specs/storage/swift/ha_serial_scaleout/newton/manifest	2016-10-13 15:30:54 +0000
+++ specs/storage/swift/ha_serial_scaleout/newton/manifest	2017-11-23 13:55:35 +0000
@@ -7,12 +7,6 @@
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
-# Add service relations
-deploy config=swift-ha-proxy-phase2.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
-
-# Check juju statuses are green and that hooks have finished
-verify config=check_juju.py
-
 # Setup glance images
 script config=image_setup.py
 
@@ -25,6 +19,9 @@
 # Test obj store by sending and recieving files
 verify config=test_obj_store.py
 
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
 # Add a swift-proxy unit
 script config=add_unit.py UNITS='swift-proxy:1'
 
 
=== removed symlink 'specs/storage/swift/ha_serial_scaleout/newton/swift-ha-proxy-phase2.yaml'
=== target was u'../../../../../helper/bundles/swift-ha-proxy-phase2.yaml'
=== added directory 'specs/storage/swift/ha_serial_scaleout/ocata'
=== added file 'specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt'
--- specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/swift/ha_serial_scaleout/ocata/SPEC_INFO.txt	2017-11-23 13:55:35 +0000
@@ -0,0 +1,3 @@
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
 
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/add_unit.py'
=== target is u'../../../../../helper/setup/add_unit.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/collect-next-swift-proxy'
=== target is u'../../../../../helper/collect/collect-next-swift-proxy'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/storage/swift/ha_serial_scaleout/ocata/manifest'
--- specs/storage/swift/ha_serial_scaleout/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/swift/ha_serial_scaleout/ocata/manifest	2017-11-23 13:55:35 +0000
@@ -0,0 +1,49 @@
+# Collect the charm branches from Launchpad 
+collect config=collect-next-swift-proxy
+
+# Deploy service units
+deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
+# Add a swift-proxy unit
+script config=add_unit.py UNITS='swift-proxy:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add swift-storage units
+script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success
 
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/swift-ha-proxy-phase1.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/ocata/utils'
=== target is u'../../../../../helper/utils'
=== added directory 'specs/storage/swift/ha_serial_scaleout/pike'
=== added file 'specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt'
--- specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/storage/swift/ha_serial_scaleout/pike/SPEC_INFO.txt	2017-11-23 13:55:35 +0000
@@ -0,0 +1,3 @@
+This spec deploys a swift cluster fronted by multiple swift proxy front ends.
+Swift proxy is then scaled out and once that has completed swift storage is
+scaled out. The resulting object store is then retested.
 
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/add_unit.py'
=== target is u'../../../../../helper/setup/add_unit.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/check_juju.py'
=== target is u'../../../../../helper/tests/check_juju.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/collect-next-swift-proxy'
=== target is u'../../../../../helper/collect/collect-next-swift-proxy'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/image_setup.py'
=== target is u'../../../../../helper/setup/image_setup.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/images.yaml'
=== target is u'../../../../../helper/setup/images.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/juju_set.py'
=== target is u'../../../../../helper/setup/juju_set.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/keystone_setup.py'
=== target is u'../../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/keystone_users.yaml'
=== target is u'../../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/storage/swift/ha_serial_scaleout/pike/manifest'
--- specs/storage/swift/ha_serial_scaleout/pike/manifest	1970-01-01 00:00:00 +0000
+++ specs/storage/swift/ha_serial_scaleout/pike/manifest	2017-11-23 13:55:35 +0000
@@ -0,0 +1,49 @@
+# Collect the charm branches from Launchpad 
+collect config=collect-next-swift-proxy
+
+# Deploy service units
+deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Inc. cluster count
+script config=juju_set.py SERVICE='swift-hacluster' KV='cluster_count=4' WAIT='False'
+
+# Add a swift-proxy unit
+script config=add_unit.py UNITS='swift-proxy:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Add swift-storage units
+script config=add_unit.py UNITS='swift-storage-z1:1 swift-storage-z2:1 swift-storage-z3:1'
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Check ring data is consistent accross proxies
+verify config=swift_ring_status.py
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success
 
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/swift-ha-proxy-phase1.yaml'
=== target is u'../../../../../helper/bundles/swift-ha-proxy-phase1.yaml'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/swift_ring_status.py'
=== target is u'../../../../../helper/tests/swift_ring_status.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/test_obj_store.py'
=== target is u'../../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/storage/swift/ha_serial_scaleout/pike/utils'
=== target is u'../../../../../helper/utils'