Merge "modify conf files for ceph-openstack" into dev/experimental

conf/flavor/chef_ceph_openstack.conf

@@ -6,10 +6,9 @@ FLAVORS = [
     'template': 'multinodes.tmpl',
     'roles': [
         'os-ops-database', 'os-ops-messaging', 'os-identity', 'os-compute-controller',
-        'ceph-mon', 'ceph-osd', 'ceph-mds', 'ceph-radosgw', 'os-compute-worker',
-        'os-network-worker', 'os-network-server', 'os-block-storage-controller',
-        'os-block-storage-volume', 'os-ceph-image', 'os-dashboard',
-        'ceph-os-block-config', 'ceph-os-compute-config', 'ceph-os-object-config',
-        'openstack_config_mon', 'openstack_config_radosgw'
+        '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'
     ]
 }]

conf/role/chef_ceph_openstack.conf

@@ -1,106 +1,77 @@
 ADAPTER_NAME = 'ceph_openstack_icehouse'
 ROLES = [{
-    'role': 'os-compute-worker',
-    'display_name': 'compute',
+    'role': 'os-ceph-compute-worker',
+    'display_name': 'compute node',
     'description': 'compute node'
 }, {
     'role': 'os-network',
-    'display_name': 'network',
+    'display_name': 'network node',
     'description': 'network node including network server'
 }, {
     'role': 'os-network-server',
-    'display_name': 'network server',
+    'display_name': 'network server node',
     'description': 'network server node'
 }, {
     'role': 'os-network-worker',
-    'display_name': 'network worker',
+    'display_name': 'network node',
     'description': 'network node including network server'
 }, {
     'role': 'os-block-storage-controller',
-    'display_name': 'storage controller',
+    'display_name': 'storage controller node',
     'description': 'storage controller node'
 }, {
-    'role': 'os-block-storage-volume',
-    'display_name': 'storage worker',
+    'role': 'os-ceph-block-storage-volume',
+    'display_name': 'storage node',
     'description': 'storage node'
 }, {
     'role': 'os-ceph-image',
-    'display_name': 'image',
-    'description': 'image node for Ceph & OpenStack'
+    'display_name': 'image node',
+    'description': 'image node'
 }, {
     'role': 'os-compute-vncproxy',
-    'display_name': 'vnc proxy',
+    'display_name': 'vnc proxy node',
     'description': 'vnc proxy node'
-}, {
-    'role': 'os-controller',
-    'display_name': 'controller',
-    'description': 'controller node including identity, dashboard, network server, and block stroage controller services'
 }, {
     'role': 'os-compute-controller',
-    'display_name': 'controller-only',
+    'display_name': 'controller-only node',
     'description': 'controller node for nova APIs'
 }, {
     'role': 'os-ops-messaging',
-    'display_name': 'message queue',
+    'display_name': 'message queue node',
     'description': 'message queue node'
 }, {
     'role': 'os-ops-database',
-    'display_name': 'database',
+    'display_name': 'database node',
     'description': 'database node'
 }, {
     'role': 'os-identity',
-    'display_name': 'keystone',
+    'display_name': 'keystone node',
     'description': 'keystone node'
 }, {
     'role': 'os-dashboard',
-    'display_name': 'dashboard',
+    'display_name': 'dashboard node',
     'description': 'dashboard node'
 }, {
     'role': 'os-ha',
-    'display_name': 'ha proxy',
-    'description': 'ha proxy node'
-}, {
-    'role': 'allinone-compute',
-    'display_name': 'all in one node',
-    'description': 'all in one compute'
-}, {
-    'role': 'ceph-os-block-config',
-    'display_name': 'ceph-os block config',
-    'description': 'ceph os block config'
-}, {
-    'role': 'ceph-os-compute-config',
-    'display_name': 'ceph-os compute config',
-    'description': 'ceph os compute config'
-}, {
-    'role': 'ceph-os-object-config',
-    'display_name': 'ceph-os object config',
-    'description': 'ceph openstack object storage config'
+    'display_name': 'ha proxy node',
+    'description': 'ha proxy node',
+    'optional': True
 }, {
     'role': 'ceph-mds',
-    'display_name': 'ceph MDS',
+    'display_name': 'ceph metadata server',
     'description': 'ceph metadata server',
     'optional': True
 }, {
-    'role': 'ceph-mon',
-    'display_name': 'ceph monitor',
+    'role': 'ceph-os-mon',
+    'display_name': 'ceph monitor server',
     'description': 'ceph monitor server'
 }, {
     'role': 'ceph-osd',
-    'display_name': 'ceph OSD',
+    'display_name': 'ceph storage server',
     'description': 'ceph storage server'
 }, {
-    'role': 'ceph-radosgw',
-    'display_name': 'ceph radosgw',
+    'role': 'ceph-os-radosgw',
+    'display_name': 'ceph object gateway',
     'description': 'ceph object gateway',
     'optional': True
-}, {
-    'role': 'openstack_config_mon',
-    'display_name': 'ceph-os mon config',
-    'description': 'ceph openstack Monitor config',
-    'optional': True
-}, {
-    'role': 'openstack_config_radosgw',
-    'display_name': 'ceph-os radosgw config',
-    'description': 'ceph openstack radosgw config',
-    'optional': True
 }]

conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl

@@ -32,7 +32,7 @@
 #end if
 #set devices = json.dumps($devices, encoding='utf-8')
 
-#set radosgw_role = $getVar('ceph_radosgw', '')
+#set radosgw_role = $getVar('ceph_os_radosgw', '')
 #set radosgw_domain = ''
 #if $radosgw_role != ''
     #set radosgw_domain = $radosgw_role.hostname
@@ -46,7 +46,7 @@
 #set controller_nic = $controller_role.management.interface
 
 ## Compute node management IP/interface
-#set compute_role = $getVar('os_compute_worker', None)
+#set compute_role = $getVar('os_ceph_compute_worker', None)
 #set compute_nic = $compute_role.management.interface
 
 ## Network server/worker node IP/interface