Merge lp:~gnuoy/openstack-mojo-specs/mojo-4g-gateway into lp:openstack-mojo-specs

[Liam Young]

Add a 4G constraint to neutron-gateway accross all non-metal bundles.

Add a spec for stable + ssl + newton

[lp:~gnuoy/openstack-mojo-specs/mojo-4g-gateway]

282. By Liam Young on 2016-10-06

Update all non-metal bundles to specify a 4G gateway

[James Page (james-page)]

review: Approve

=== modified file 'helper/bundles/full-next.yaml'
--- helper/bundles/full-next.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/full-next.yaml	2016-10-06 09:03:11 +0000
@@ -43,7 +43,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/full-ssl-next.yaml'
--- helper/bundles/full-ssl-next.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/full-ssl-next.yaml	2016-10-06 09:03:11 +0000
@@ -47,7 +47,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/full-ssl.yaml'
--- helper/bundles/full-ssl.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/full-ssl.yaml	2016-10-06 09:03:11 +0000
@@ -50,7 +50,7 @@
         network-manager: Quantum
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
     cinder:

=== modified file 'helper/bundles/full-vrrpha-next.yaml'
--- helper/bundles/full-vrrpha-next.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/full-vrrpha-next.yaml	2016-10-06 09:03:11 +0000
@@ -32,7 +32,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       num_units: 2
       options:
         instance-mtu: 1300

=== modified file 'helper/bundles/full.yaml'
--- helper/bundles/full.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/full.yaml	2016-10-06 09:03:11 +0000
@@ -46,7 +46,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
     cinder:

=== modified file 'helper/bundles/ha-next.yaml'
--- helper/bundles/ha-next.yaml	2016-09-13 05:18:45 +0000
+++ helper/bundles/ha-next.yaml	2016-10-06 09:03:11 +0000
@@ -75,7 +75,7 @@
         cluster_count: 3
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	2016-09-13 05:18:45 +0000
+++ helper/bundles/ha.yaml	2016-10-06 09:03:11 +0000
@@ -79,7 +79,7 @@
         cluster_count: 3
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
     cinder:

=== modified file 'helper/bundles/haphase1-next.yaml'
--- helper/bundles/haphase1-next.yaml	2016-06-16 11:43:38 +0000
+++ helper/bundles/haphase1-next.yaml	2016-10-06 09:03:11 +0000
@@ -56,7 +56,7 @@
       charm: hacluster
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       num_units: 2
       options:
         instance-mtu: 1350

=== modified file 'helper/bundles/haphase1.yaml'
--- helper/bundles/haphase1.yaml	2016-04-12 02:00:56 +0000
+++ helper/bundles/haphase1.yaml	2016-10-06 09:03:11 +0000
@@ -60,7 +60,7 @@
       charm: hacluster
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       num_units: 2
       options:
         instance-mtu: 1350

=== modified file 'helper/bundles/haphase2-next.yaml'
--- helper/bundles/haphase2-next.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/haphase2-next.yaml	2016-10-06 09:03:11 +0000
@@ -56,7 +56,7 @@
       charm: hacluster
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       num_units: 2
       options:
         instance-mtu: 1350

=== modified file 'helper/bundles/haphase2.yaml'
--- helper/bundles/haphase2.yaml	2016-10-05 08:28:20 +0000
+++ helper/bundles/haphase2.yaml	2016-10-06 09:03:11 +0000
@@ -60,7 +60,7 @@
       charm: hacluster
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       num_units: 2
       options:
         instance-mtu: 1350

=== modified file 'helper/bundles/ksv3-full-next.yaml'
--- helper/bundles/ksv3-full-next.yaml	2016-09-22 21:25:04 +0000
+++ helper/bundles/ksv3-full-next.yaml	2016-10-06 09:03:11 +0000
@@ -48,7 +48,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/ksv3-full.yaml'
--- helper/bundles/ksv3-full.yaml	2016-09-27 05:11:38 +0000
+++ helper/bundles/ksv3-full.yaml	2016-10-06 09:03:11 +0000
@@ -48,7 +48,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/minimal-next.yaml'
--- helper/bundles/minimal-next.yaml	2016-09-13 05:18:45 +0000
+++ helper/bundles/minimal-next.yaml	2016-10-06 09:03:11 +0000
@@ -30,7 +30,7 @@
         network-manager: Neutron
     neutron-gateway:
       charm: neutron-gateway
-      constraints: mem=1G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex

=== modified file 'helper/bundles/ovs-odl.yaml'
--- helper/bundles/ovs-odl.yaml	2016-05-10 22:55:00 +0000
+++ helper/bundles/ovs-odl.yaml	2016-10-06 09:03:11 +0000
@@ -3,6 +3,7 @@
   services:
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
+      constraints: mem=4G
       options:
         plugin: ovs-odl
         instance-mtu: 1400

=== added directory 'specs/full_stack/stable_deploy_ssl/newton'
=== added file 'specs/full_stack/stable_deploy_ssl/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_deploy_ssl/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_ssl/newton/SPEC_INFO.txt	2016-10-06 09:03:11 +0000
@@ -0,0 +1,2 @@
+This spec performs a non-ha deploy using the stable charms wil ssl enabled
+and then runs tests to validate the deployment

=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/collect-stable-trusty'
=== target is u'../../../../helper/collect/collect-stable-trusty'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/collect-stable-xenial'
=== target is u'../../../../helper/collect/collect-stable-xenial'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/full-ssl.yaml'
=== target is u'../../../../helper/bundles/full-ssl.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/git_checkout_stable.py'
=== target is u'../../../../helper/setup/git_checkout_stable.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_deploy_ssl/newton/manifest'
--- specs/full_stack/stable_deploy_ssl/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_deploy_ssl/newton/manifest	2016-10-06 09:03:11 +0000
@@ -0,0 +1,26 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-${MOJO_SERIES}
+
+# Checkout stable
+script config=git_checkout_stable.py
+
+
+# Use juju deployer with full.yaml bundle
+deploy config=full-ssl.yaml delay=0 wait=True target=${MOJO_SERIES}-newton
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# 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"
+
+# Success

=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_deploy_ssl/newton/utils'
=== target is u'../../../../helper/utils'