From e412446bacf282be68c00998d4eb2df3e67e0d10 Mon Sep 17 00:00:00 2001 From: Lei Lei Date: Thu, 30 Apr 2015 11:32:58 -0700 Subject: [PATCH] Update config files for ui package metadata. Change-Id: Ic8f09237e869db54f37a6b702ec68bde5f57cdc1 --- conf/flavor_mapping/allinone.conf | 83 +++++++++++++++-- .../ceph_openstack_multinodes.conf | 93 +++++++++++++++++-- .../ceph_openstack_single_controller.conf | 93 +++++++++++++++++-- conf/flavor_mapping/ha-multinodes.conf | 85 +++++++++++++++-- conf/flavor_mapping/multinodes.conf | 83 +++++++++++++++-- .../single-contoller-multi-compute.conf | 85 +++++++++++++++-- 6 files changed, 468 insertions(+), 54 deletions(-) diff --git a/conf/flavor_mapping/allinone.conf b/conf/flavor_mapping/allinone.conf index 6d9c8925..d35386b7 100644 --- a/conf/flavor_mapping/allinone.conf +++ b/conf/flavor_mapping/allinone.conf @@ -7,7 +7,41 @@ allinone = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,7 +50,41 @@ allinone = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "neutron_config": { @@ -38,21 +106,20 @@ allinone = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "hint": "e.g. 1:1000", - "default_value": "1:1000" + "hint": "1:1000", }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } } diff --git a/conf/flavor_mapping/ceph_openstack_multinodes.conf b/conf/flavor_mapping/ceph_openstack_multinodes.conf index a174e537..57294c49 100644 --- a/conf/flavor_mapping/ceph_openstack_multinodes.conf +++ b/conf/flavor_mapping/ceph_openstack_multinodes.conf @@ -7,7 +7,41 @@ ceph_openstack_multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,22 +50,62 @@ ceph_openstack_multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "ceph_config": { "accordion_heading": "Ceph Global Configurations", - "category": "ceph", + "category": "ceph_config", "data_structure": "form", "form_name": "cephForm", "data": { "global_config": { - "osd_pool_pgp_num": { + "osd_pool_pg_num": { "label": "OSD Pool PG Number", "mapped_key": [ "name", "is_required", "display_type", "default_value" ] }, + "osd_pool_pgp_num": { + "label": "OSD Pool PGP Number", + "mapped_key": [ + "name", "is_required", "display_type", "default_value" + ] + }, "osd_pool_size": { "label": "OSD Pool Size", "mapped_key": [ @@ -75,21 +149,20 @@ ceph_openstack_multinodes = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "hint": "e.g. 1:1000", - "default_value": "1:1000" + "hint": "1:1000", }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } } diff --git a/conf/flavor_mapping/ceph_openstack_single_controller.conf b/conf/flavor_mapping/ceph_openstack_single_controller.conf index 584b2e50..ef0293b9 100644 --- a/conf/flavor_mapping/ceph_openstack_single_controller.conf +++ b/conf/flavor_mapping/ceph_openstack_single_controller.conf @@ -7,7 +7,41 @@ ceph_openstack_single_controller = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,22 +50,62 @@ ceph_openstack_single_controller = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "ceph_config": { "accordion_heading": "Ceph Global Configurations", - "category": "ceph", + "category": "ceph_config", "data_structure": "form", "form_name": "cephForm", "data": { "global_config": { - "osd_pool_pgp_num": { + "osd_pool_pg_num": { "label": "OSD Pool PG Number", "mapped_key": [ "name", "is_required", "display_type", "default_value" ] }, + "osd_pool_pgp_num": { + "label": "OSD Pool PGP Number", + "mapped_key": [ + "name", "is_required", "display_type", "default_value" + ] + }, "osd_pool_size": { "label": "OSD Pool Size", "mapped_key": [ @@ -75,21 +149,20 @@ ceph_openstack_single_controller = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "default_value": "1:1000", - "hint": "e.g. 1:1000" + "hint": "1:1000", }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } } diff --git a/conf/flavor_mapping/ha-multinodes.conf b/conf/flavor_mapping/ha-multinodes.conf index 3fea962c..4472abc2 100644 --- a/conf/flavor_mapping/ha-multinodes.conf +++ b/conf/flavor_mapping/ha-multinodes.conf @@ -7,7 +7,41 @@ HA_multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,13 +50,47 @@ HA_multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "neutron_config": { "accordion_heading": "Neutron Configurations", "data_structure": "form", - "category": "neutron", + "category": "neutron_config", "form_name": "neutronForm", "data": { "openvswitch": { @@ -38,21 +106,20 @@ HA_multinodes = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "default_value": "1:1000", - "hint": "e.g. 1:1000" + "hint": "1:1000", }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } } diff --git a/conf/flavor_mapping/multinodes.conf b/conf/flavor_mapping/multinodes.conf index 6b2fcfd8..35836398 100644 --- a/conf/flavor_mapping/multinodes.conf +++ b/conf/flavor_mapping/multinodes.conf @@ -7,7 +7,41 @@ multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,7 +50,41 @@ multinodes = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "neutron_config": { @@ -38,21 +106,20 @@ multinodes = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "hint": "e.g. 1:1000", - "default_value": "1:1000" + "hint": "1:1000", }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } } diff --git a/conf/flavor_mapping/single-contoller-multi-compute.conf b/conf/flavor_mapping/single-contoller-multi-compute.conf index 9c0405af..b9d5cbe9 100644 --- a/conf/flavor_mapping/single-contoller-multi-compute.conf +++ b/conf/flavor_mapping/single-contoller-multi-compute.conf @@ -7,7 +7,41 @@ single_contoller_multi_compute = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config": { + "rabbitmq": { + "username": "guest", + "password": "guest" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "identity": { + "username": "keystone", + "password": "keystone" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "mysql": { + "username": "root", + "password": "root" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "security": { @@ -16,7 +50,41 @@ single_contoller_multi_compute = { "data_structure": "table", "action": "true", "modifiable_data": ["username", "password"], - "table_display_header": ["Service", "UserName", "Password", "Action"] + "table_display_header": ["Service", "UserName", "Password", "Action"], + "config":{ + "admin": { + "username": "admin", + "password": "admin" + }, + "compute": { + "username": "nova", + "password": "nova" + }, + "dashboard": { + "username": "dashboard", + "password": "dashboard" + }, + "image": { + "username": "glance", + "password": "glance" + }, + "metering": { + "username": "ceilometer", + "password": "ceilometer" + }, + "network": { + "username": "quantum", + "password": "quantum" + }, + "object-store": { + "username": "swift", + "password": "swift" + }, + "volume": { + "username": "cinder", + "password": "cinder" + } + } } },{ "neutron_config": { @@ -30,7 +98,7 @@ single_contoller_multi_compute = { "label": "Tenant Network Type", "input_type": "dropdown", "mapped_key": [ - "name", "is_required", "options", "default_value" + "name", "is_required", "options" ], "content_data": { "gre": [{ @@ -38,21 +106,20 @@ single_contoller_multi_compute = { "is_required": "true", "display_type": "dropdown_text_multiple", "name": "tunnel_id_ranges", - "default_value": "1:1000", - "hint": "e.g. 1:1000" + "hint": "1:1000" }], "vlan": [{ "label": "Network Vlan Ranges", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "vlan_ranges", - "hint": "e.g. physnet1:2700:2999" + "name": "network_vlan_ranges", + "hint": "physnet1:2700:2999" }, { "label": "Bridge Mapping", "is_required": "true", "display_type": "dropdown_text_multiple", - "name": "bridge", - "hint": "e.g. physnet1:br-eth1" + "name": "bridge_mappings", + "hint": "physnet1:br-eth1" }] } }