Rename flavor name used in gate tests

A better description than magnum2 would be helpful as
we are creating a smaller vm.
So renamed m1.magnum2 to s1.magnum to indicate its a slave flavor.

Change-Id: Ibd74931e0b5b2ac98dc960b31aa2b64a721200ea
Closes-Bug: #1543338

doc/source/dev/functional-test.rst

@@ -44,7 +44,7 @@ Create the necessary keypair and flavor::
     source /opt/stack/devstack/openrc admin admin
     nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
     nova flavor-create  m1.magnum 100 1024 8 1
-    nova flavor-create  m1.magnum2 200 512 8 1
+    nova flavor-create  s1.magnum 200 512 8 1
 
     source /opt/stack/devstack/openrc demo demo
     nova keypair-add --pub-key ~/.ssh/id_rsa.pub default

functional_creds.conf.sample

@@ -14,5 +14,5 @@ pass = password
 image_id = fedora-21-atomic-5
 nic_id = public
 keypair_id = default
-flavor_id = m1.magnum2
+flavor_id = s1.magnum
 master_flavor_id = m1.magnum

magnum/tests/contrib/post_test_hook.sh

@@ -56,7 +56,7 @@ region_name = $OS_REGION_NAME
 image_id = $IMAGE_ID
 nic_id = $NIC_ID
 keypair_id = default
-flavor_id = m1.magnum2
+flavor_id = s1.magnum
 master_flavor_id = m1.magnum
 copy_logs = true
 csr_location = $MAGNUM_DIR/default.csr
@@ -131,7 +131,7 @@ function add_flavor {
     # Create magnum specific flavor for use in functional tests.
     echo_summary "Create a flavor"
     nova flavor-create  m1.magnum 100 1024 8 1
-    nova flavor-create  m1.magnum2 200 512 8 1
+    nova flavor-create  s1.magnum 200 512 8 1
 }
 
 if ! function_exists echo_summary; then
@@ -185,7 +185,7 @@ if [[ "api" == "$coe" ]]; then
     iniset $BASE/new/tempest/etc/tempest.conf magnum image_id $IMAGE_ID
     iniset $BASE/new/tempest/etc/tempest.conf magnum nic_id $NIC_ID
     iniset $BASE/new/tempest/etc/tempest.conf magnum keypair_id default
-    iniset $BASE/new/tempest/etc/tempest.conf magnum flavor_id m1.magnum2
+    iniset $BASE/new/tempest/etc/tempest.conf magnum flavor_id s1.magnum
     iniset $BASE/new/tempest/etc/tempest.conf magnum master_flavor_id m1.magnum
     iniset $BASE/new/tempest/etc/tempest.conf magnum csr_location $CSR_FILE
     iniset $BASE/new/tempest/etc/tempest.conf magnum copy_logs True

magnum/tests/functional/tempest_tests/config.py

@@ -41,7 +41,7 @@ MagnumGroup = [
                help="Keypair id to use to log into nova instances."),
 
     cfg.StrOpt("flavor_id",
-               default="m1.magnum2",
+               default="s1.magnum",
                help="Flavor id to use for baymodels."),
 
     cfg.StrOpt("magnum_url",