From 3327480a8f8a2f5d251a0e01ec749b8feaedf7d5 Mon Sep 17 00:00:00 2001
From: "grace.yu" <xinyu@huawei.com>
Date: Wed, 8 Oct 2014 11:40:44 -0700
Subject: [PATCH] modify conf files for cpeh+openstack

Change-Id: Iae0def41d317f07ccdf98c7fec105d3f0ff369f9
---
 conf/flavor/chef_ceph_openstack.conf                | 13 ++++++++++---
 conf/role/chef_ceph_openstack.conf                  | 10 +++++++---
 .../environments/ha_multinodes.tmpl                 |  2 +-
 .../environments/multinodes.tmpl                    |  4 ++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/conf/flavor/chef_ceph_openstack.conf b/conf/flavor/chef_ceph_openstack.conf
index 15ff09af..a93bc902 100644
--- a/conf/flavor/chef_ceph_openstack.conf
+++ b/conf/flavor/chef_ceph_openstack.conf
@@ -5,10 +5,17 @@ FLAVORS = [
     'display_name': 'Multi-node Ceph+OpenStack Cluster',
     'template': 'multinodes.tmpl',
     'roles': [
-        'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-ceph-compute-controller',
+        'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller',
         'ceph-os-mon', 'ceph-osd', 'ceph-mds', 'ceph-os-radosgw',
         'os-ceph-compute-worker', 'os-network-server',
-        'os-network-worker', 'os-ceph-block-storage-volume',
-        'os-block-storage-controller', 'os-ceph-image', 'os-dashboard'
+        'os-network-worker', 'os-block-storage-volume',
+        'os-ceph-block-storage-controller', 'os-ceph-image', 'os-dashboard'
     ]
+}, {
+   'flavor': 'ceph_openstack_single_controller',
+    'display_name': 'Single controller Ceph+OpenStack Cluster',
+    'template': 'multinodes.tmpl',
+    'roles': [
+        'os-ceph-controller', 'ceph-os-mon', 'ceph-osd', 'ceph-mds', 'ceph-os-radosgw',
+        'os-ceph-compute-worker', 'os-network-worker'
 }]
diff --git a/conf/role/chef_ceph_openstack.conf b/conf/role/chef_ceph_openstack.conf
index 19fd6ee8..1b3da0e0 100644
--- a/conf/role/chef_ceph_openstack.conf
+++ b/conf/role/chef_ceph_openstack.conf
@@ -16,11 +16,11 @@ ROLES = [{
     'display_name': 'network node',
     'description': 'network node including network server'
 }, {
-    'role': 'os-block-storage-controller',
+    'role': 'os-ceph-block-storage-controller',
     'display_name': 'storage controller node',
     'description': 'storage controller node'
 }, {
-    'role': 'os-ceph-block-storage-volume',
+    'role': 'os-block-storage-volume',
     'display_name': 'storage node',
     'description': 'storage node'
 }, {
@@ -32,10 +32,14 @@ ROLES = [{
     'display_name': 'vnc proxy node',
     'description': 'vnc proxy node'
 }, {
-    'role': 'os-ceph-compute-controller',
+    'role': 'os-compute-controller',
     'display_name': 'controller-only node',
     'description': 'controller node for nova APIs'
 }, {
+    'role': 'os-ceph-controller',
+    'display_name': 'controller node',
+    'description': 'controller node for nova APIs'
+},{
     'role': 'os-ops-messaging',
     'display_name': 'message queue node',
     'description': 'message queue node'
diff --git a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/ha_multinodes.tmpl b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/ha_multinodes.tmpl
index a0a459d1..42d00402 100644
--- a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/ha_multinodes.tmpl
+++ b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/ha_multinodes.tmpl
@@ -2,7 +2,7 @@
 #set ha_proxy_role = $getVar('os_ha', None)
 #set ha_proxy_nic = $ha_proxy_role.management.interface
 
-#set controller_role = $getVar('os_ceph_compute_controller', None)
+#set controller_role = $get_role('os_compute_controller', $getVar('os_ceph_controller', None))
 
 ## Contoller node management IP/interface
 #set controller_ip = $controller_role.management.ip
diff --git a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
index 48e32aea..089a82f8 100644
--- a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
+++ b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
@@ -41,7 +41,7 @@
 
 ## OpenStack config
 ## Contoller node management IP/interface
-#set controller_role = $get_role('os_ceph_compute_controller', $getVar('os_controller', None))
+#set controller_role = $get_role('os_compute_controller', $getVar('os_ceph_controller', None))
 #set controller_ip = $controller_role.management.ip
 #set controller_nic = $controller_role.management.interface
 
@@ -83,7 +83,7 @@
 #set glance_nic = $glance_role.management.interface
 
 ## Cinder node management IP/interface
-#set cinder_role = $get_role('os_block_storage_controller', $controller_role)
+#set cinder_role = $get_role('os_ceph_block_storage_controller', $controller_role)
 #set cinder_controller_ip = $cinder_role.management.ip
 #set cinder_controller_nic = $cinder_role.management.interface