Merge lp:~gnuoy/openstack-mojo-specs/ocata-ftw into lp:openstack-mojo-specs

[Liam Young]

[lp:~gnuoy/openstack-mojo-specs/ocata-ftw]

294. By Liam Young on 2017-02-10

Add ocata support to more bundles

[James Page (james-page)]

review: Approve

=== modified file 'helper/bundles/full-dvr-next.yaml'
--- helper/bundles/full-dvr-next.yaml	2016-09-13 05:18:45 +0000
+++ helper/bundles/full-dvr-next.yaml	2017-02-10 11:43:49 +0000
@@ -258,4 +258,14 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
 
 
=== modified file 'helper/bundles/full-next.yaml'
--- helper/bundles/full-next.yaml	2016-10-05 17:05:32 +0000
+++ helper/bundles/full-next.yaml	2017-02-10 11:43:49 +0000
@@ -309,4 +309,13 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
 
=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2017-01-27 11:53:05 +0000
+++ helper/bundles/full.yaml	2017-02-10 11:43:49 +0000
@@ -297,3 +297,13 @@
   overrides:
     openstack-origin: cloud:xenial-newton/proposed
     source: cloud:xenial-newton/proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-icehouse
+  series: zesty
 
=== modified file 'helper/bundles/ha-next.yaml'
--- helper/bundles/ha-next.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/ha-next.yaml	2017-02-10 11:43:49 +0000
@@ -268,3 +268,13 @@
     source: proposed
     openstack-origin: distro-proposed
     ha-bindiface: ens2
+# ocata
+xenial-ocata-ha:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata-ha:
+  inherits: openstack-services
+  series: zesty
 
=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	2016-10-06 08:56:04 +0000
+++ helper/bundles/ha.yaml	2017-02-10 11:43:49 +0000
@@ -271,3 +271,13 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# ocata
+xenial-ocata:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-ocata
+    source: cloud:xenial-ocata
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty
 
=== added directory 'specs/full_stack/next_ha_oneshot/ocata'
=== added file 'specs/full_stack/next_ha_oneshot/ocata/SPEC_INFO.txt'
--- specs/full_stack/next_ha_oneshot/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/SPEC_INFO.txt	2017-02-10 11:43:49 +0000
@@ -0,0 +1,3 @@
+This spec performs a ha deploy in one shot (not phased) then runs tests to
+validate the deployment. The assumption is that the version of juju has
+leadership enabled.
 
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/ha.yaml'
=== target is u'../../../../helper/bundles/ha-next.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
--- specs/full_stack/next_ha_oneshot/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/manifest	2017-02-10 11:43:49 +0000
@@ -0,0 +1,22 @@
+# Collect the charm branches from Launchpad
+collect config=collect-next-ha
+
+# Use juju deployer to create the units for the deployment
+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-ocata-ha
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success
 
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/utils'
=== target is u'../../../../helper/utils'