| commit | 4193d5efc28bb9d0c8b81b068a0df10fd6a4a754 | [log] [tgz] |
|---|---|---|
| author | vrovachev <vrovachev@mirantis.com> | Wed Jun 28 11:03:39 2017 +0400 |
| committer | vrovachev <vrovachev@mirantis.com> | Thu Jun 29 11:26:17 2017 +0400 |
| tree | e334028cb69eaf4a85fb28db0dafdc5968bb382e | |
| parent | c12dd41e27d87b3988fd13320fb5ed8e66f01480 [diff] |
Add contrail and virtlet parameters * Added virtlet addon parameters to k8s+contrail template. * Added kube_network_manager addon parameters to k8s+contrail template. Change-Id: I29e315aea3688a5bc2169abffc4c02ced5239c26
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml index 912e753..0eec1b0 100644 --- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml +++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
@@ -22,4 +22,4 @@ kubernetes: pool: network: - hash: 2276df10feae8f09fb50dce3a96fff6c + hash: ${_param:opencontrail_network_hash}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml index cd3445a..ad264cb 100644 --- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml +++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
@@ -18,6 +18,8 @@ openstack_control_address: none keystone_admin_password: none + opencontrail_network_hash: 2276df10feae8f09fb50dce3a96fff6c + linux: network: host: