From 5bbde9025c85090e6f52f967be1189000903ae36 Mon Sep 17 00:00:00 2001
From: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date: Mon, 14 Aug 2017 20:02:11 +0800
Subject: [PATCH] Correct placement start order in devstack

Start placement service before mogan start, as the periodic task
will access placement on start. And change default resource class
to 'baremetal' to keep consistency with ironic.

Change-Id: Ib1d050927dedd4897bc0262b92c82c64170b2aac
---
 devstack/plugin.sh            | 16 ++++++----------
 mogan/tests/tempest/config.py |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa12f401..fc262140 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -187,8 +187,6 @@ function cleanup_mogan {
 
 
 function create_flavor {
-    # this makes consistency with ironic resource class, will move the mogan flavor
-    # creation to ironic devstack plugin when we are official.
     if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then
         local ironic_node_cpu=$IRONIC_VM_SPECS_CPU
         local ironic_node_ram=$IRONIC_VM_SPECS_RAM
@@ -198,10 +196,8 @@ function create_flavor {
         local ironic_node_ram=$IRONIC_HW_NODE_RAM
         local ironic_node_disk=$IRONIC_HW_NODE_DISK
     fi
-    # this will look like baremetal_1cpu_256mbram_10gbdisk
-    resource_class="baremetal_${ironic_node_cpu}cpu_${ironic_node_ram}mbram_${ironic_node_disk}gbdisk"
     description="CPU: ${ironic_node_cpu}, RAM: ${ironic_node_ram}MB, DISK: ${ironic_node_disk}GB"
-    openstack baremetal flavor create ${resource_class} --description "${description}" --resources ${resource_class}=1
+    openstack baremetal flavor create $IRONIC_DEFAULT_RESOURCE_CLASS --description "${description}" --resources $IRONIC_DEFAULT_RESOURCE_CLASS=1
 }
 
 
@@ -229,16 +225,16 @@ if is_service_enabled mogan; then
             configure_placement
         fi
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
-        echo_summary "Initializing mogan"
-        init_mogan
-        start_mogan
-        echo_summary "Creating flavor"
-        create_flavor
         # TODO(zhenguo): Remove this when placement is started as a separated service
         if ! is_service_enabled placement; then
             init_placement
             start_placement
         fi
+        echo_summary "Initializing mogan"
+        init_mogan
+        start_mogan
+        echo_summary "Creating flavor"
+        create_flavor
     fi
 
     if [[ "$1" == "unstack" ]]; then
diff --git a/mogan/tests/tempest/config.py b/mogan/tests/tempest/config.py
index 31d27767..07dd426d 100644
--- a/mogan/tests/tempest/config.py
+++ b/mogan/tests/tempest/config.py
@@ -32,7 +32,7 @@ baremetal_compute_group = cfg.OptGroup(
 
 BaremetalComputeGroup = [
     cfg.StrOpt('baremetal_resource_class',
-               default='baremetal_1cpu_1024mbram_10gbdisk',
+               default='baremetal',
                help="The resource class of baremetal resource providers, "
                     "which will be reported to placement service and be "
                     "matched with Mogan flavor for scheduling."),