summaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-03-20 09:35:29 +0800
committerJustin chi <chigang@huawei.com>2017-03-20 06:11:48 +0000
commit9e35083d2445d0f9260748b1b3473d1f45c74151 (patch)
treeb281b42389fbadb3ad13db7523a79c14ddf0730d /deploy/compass_conf
parent4b003c873eac38684844a4c2b19665c2f0362843 (diff)
update opera fix
opera codes has been updated and network_openo.yml is modified according to new opera net config. open-o related keys in deploy/compass_conf/package_metadata/openstack.conf should be modified as well Change-Id: I55f8ed3dedcbfd30a3f01b70c958258199f600e6 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com> (cherry picked from commit b7fb5c062e0e806e34ebc53fe670f00f8417cd4a)
Diffstat (limited to 'deploy/compass_conf')
-rwxr-xr-xdeploy/compass_conf/package_metadata/openstack.conf62
1 files changed, 6 insertions, 56 deletions
diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf
index 555f007c..b07efd4e 100755
--- a/deploy/compass_conf/package_metadata/openstack.conf
+++ b/deploy/compass_conf/package_metadata/openstack.conf
@@ -250,79 +250,29 @@ METADATA = {
'is_required': False
},
- 'openo_vm_ip': {
+ 'openo_ip': {
'_self': {
- 'mapping_to': 'openo_vm_ip',
+ 'mapping_to': 'openo_ip',
'is_required': False,
'field': 'general',
}
},
- 'openo_vm_mask': {
+ 'openo_docker_gw': {
'_self': {
- 'mapping_to': 'openo_vm_mask',
+ 'mapping_to': 'openo_docker_gw',
'is_required': False,
'field': 'general',
}
},
- 'openo_external_gw': {
+ 'openo_docker_cidr': {
'_self': {
- 'mapping_to': 'openo_external_gw',
- 'is_required': False,
- 'field': 'general',
- }
- },
- 'openo_external_cidr': {
- '_self': {
- 'mapping_to': 'openo_external_cidr',
- 'is_required': False,
- 'field': 'general',
- }
- }
- },
-
- 'openo_docker_net': {
- '_self': {
- 'mapping_to': 'openo_docker_net',
- 'is_required': False
- },
-
- 'docker_ip_start': {
- '_self': {
- 'mapping_to': 'docker_ip_start',
- 'is_required': False,
- 'field': 'general',
- }
- },
- 'docker_ip_end': {
- '_self': {
- 'mapping_to': 'docker_ip_end',
+ 'mapping_to': 'openo_docker_cidr',
'is_required': False,
'field': 'general',
}
}
},
- 'juju_net': {
- '_self': {
- 'mapping_to': 'juju_net',
- 'is_required': False
- },
-
- 'juju_net_cidr': {
- '_self': {
- 'mapping_to': 'juju_net_cidr',
- 'is_required': False,
- 'field': 'general',
- }
- },
- 'juju_net_gw': {
- '_self': {
- 'mapping_to': 'juju_net_gw',
- 'is_required': False,
- 'field': 'general',
- }
- }
- },
'public_net_info': {
'_self': {