Move default parameters to system level
Depends-On: https://gerrit.mcp.mirantis.com/42799
Change-Id: I04f33edab5f2c1f88ff0d8721024cbcbd2bdca33
Related-PROD: PROD-29523 (PROD:29523)
(cherry picked from commit 6233bb16384853f410c01d6cce63ae6edc473f6a)
diff --git a/metadata/service/compute/cluster.yml b/metadata/service/compute/cluster.yml
index 50542d1..a3729e8 100644
--- a/metadata/service/compute/cluster.yml
+++ b/metadata/service/compute/cluster.yml
@@ -5,4 +5,15 @@
parameters:
opencontrail:
compute:
- enabled: true
+ enabled: True
+ version: ${_param:opencontrail_version}
+ disable_flow_collection: False
+ bind:
+ address: ${_param:single_address}
+ interface:
+ address: ${_param:opencontrail_compute_address}
+ dev: ${_param:opencontrail_compute_iface}
+ gateway: ${_param:opencontrail_compute_gateway}
+ mask: ${_param:opencontrail_compute_iface_mask}
+ dns: ${_param:opencontrail_compute_dns}
+ mtu: 9000
\ No newline at end of file
diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml
index 05ca1bc..115ef4c 100644
--- a/metadata/service/compute/single.yml
+++ b/metadata/service/compute/single.yml
@@ -3,12 +3,17 @@
classes:
- service.opencontrail.support
parameters:
- _param:
- opencontrail_version: 2.2
opencontrail:
compute:
- version: ${_param:opencontrail_version}
enabled: true
+ version: ${_param:opencontrail_version}
+ interface:
+ address: ${_param:opencontrail_compute_address}
+ dev: ${_param:opencontrail_compute_iface}
+ gateway: ${_param:opencontrail_compute_gateway}
+ mask: ${_param:opencontrail_compute_iface_mask}
+ dns: ${_param:opencontrail_compute_dns}
+ mtu: 9000
nova:
compute:
networking: contrail
diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index 936e5f7..e3fb303 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -3,16 +3,6 @@
classes:
- service.opencontrail.support
parameters:
- _param:
- opencontrail_version: 2.2
- opencontrail_identity_protocol: http
- opencontrail_identity_port: 35357
- opencontrail_identity_version: '2.0'
- opencontrail_admin_password: 'none'
- opencontrail_admin_user: 'contrail'
- keystone_service_token: 'none'
- opencontrail_redis_password: 'none'
- openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 2450352..48d048c 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -3,16 +3,6 @@
classes:
- service.opencontrail.support
parameters:
- _param:
- opencontrail_version: 2.2
- opencontrail_identity_protocol: http
- opencontrail_identity_port: 35357
- opencontrail_identity_version: '2.0'
- opencontrail_admin_password: 'none'
- opencontrail_admin_user: 'contrail'
- keystone_service_token: 'none'
- opencontrail_redis_password: 'none'
- openstack_region: RegionOne
opencontrail:
common:
version: ${_param:opencontrail_version}
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 3d618f2..7ea5014 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -3,16 +3,6 @@
classes:
- service.opencontrail.support
parameters:
- _param:
- opencontrail_version: 2.2
- opencontrail_identity_protocol: http
- opencontrail_identity_port: 35357
- opencontrail_identity_version: '2.0'
- opencontrail_admin_password: 'none'
- opencontrail_admin_user: 'contrail'
- keystone_service_token: 'none'
- openstack_region: RegionOne
- opencontrail_redis_password: 'none'
opencontrail:
common:
version: ${_param:opencontrail_version}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 5478d5c..7012569 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -3,16 +3,6 @@
classes:
- service.opencontrail.support
parameters:
- _param:
- opencontrail_version: 2.2
- opencontrail_identity_protocol: http
- opencontrail_identity_port: 35357
- opencontrail_identity_version: '2.0'
- opencontrail_admin_password: 'none'
- opencontrail_admin_user: 'contrail'
- keystone_service_token: 'none'
- openstack_region: RegionOne
- opencontrail_redis_password: 'none'
opencontrail:
common:
version: ${_param:opencontrail_version}