From e7fda435edc2a9493df8303148ab5ad9ecaf5d65 Mon Sep 17 00:00:00 2001 From: Ming He Date: Tue, 29 Dec 2015 18:57:14 -0800 Subject: [PATCH] add missing ui metadata Change-Id: I14a141fe6f8961287edb4ac5d0b25313fb95d330 --- conf/os_mapping/os_mapping.conf | 25 +++++++++++++++++++++++++ conf/os_metadata/general.conf | 2 +- conf/package_metadata/openstack.conf | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/conf/os_mapping/os_mapping.conf b/conf/os_mapping/os_mapping.conf index 0be15e48..cf7b1c85 100644 --- a/conf/os_mapping/os_mapping.conf +++ b/conf/os_mapping/os_mapping.conf @@ -156,6 +156,31 @@ CONFIG_MAPPING = { "mapped_key": [ "name", "is_required", "display_type" ] + }, + "repo_name": { + "placeholder": "Repo Name", + "display_name": "Repository", + "default_value": "trusty-juno-ppa", + "order": 12, + "mapped_key": [ + "name", "is_required", "display_type" + ] + }, + "deploy_type": { + "placeholder": "Deploy Type", + "display_name": "Deploy Type", + "default_value": "virtual", + "order": 13, + "mapped_key": [ + "name", "is_required", "display_type" + ], + "options": [{ + "name": "virtual", + "value": "virtual" + },{ + "name": "baremetal", + "value": "baremetal" + }], } } } diff --git a/conf/os_metadata/general.conf b/conf/os_metadata/general.conf index 1f36e15a..be499307 100644 --- a/conf/os_metadata/general.conf +++ b/conf/os_metadata/general.conf @@ -116,7 +116,7 @@ METADATA = { 'is_required': True, 'default_value': 'baremetal', 'options': [ - 'baremetal', 'virtul' + 'baremetal', 'virtual' ], 'mapping_to': 'deploy_type' } diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf index 6ad1c945..d59f1cfe 100644 --- a/conf/package_metadata/openstack.conf +++ b/conf/package_metadata/openstack.conf @@ -8,7 +8,7 @@ METADATA = { '_self': { 'required_in_whole_config': True, 'key_extensions': { - '$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'network', 'rabbitmq', 'volume', 'mysql', 'heat'] + '$service': ['image', 'compute', 'dashboard', 'identity', 'metering', 'rabbitmq', 'volume', 'mysql', 'heat'] }, 'mapping_to': 'service_credentials' }, @@ -37,7 +37,7 @@ METADATA = { '_self': { 'required_in_whole_config': True, 'key_extensions': { - '$console': ['admin', 'demo', 'compute', 'dashboard', 'identity', 'image', 'metering', 'network', 'object-store', 'volume', 'heat'] + '$console': ['admin', 'compute', 'dashboard', 'image', 'metering', 'network', 'object-store', 'volume', 'heat'] }, 'mapping_to': 'console_credentials' },