diff options
| author |   Justin chi <chigang@huawei.com> | 2018-06-13 06:28:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-13 06:28:34 +0000 |
| commit | 85eda35624cacbd473c097bc2638c2d874c01c07 (patch) | |
| tree | 349bf36c490a9ed7c3dea83d9b5ded3d18c6e2fa /deploy/compass_conf | |
| parent | c3f43c48a7f8de5855749b922f97e2185c04ad5c (diff) | |
| parent | 09db9c1968ed9586078d193b16e226553754dd92 (diff) | |
Merge "use contrail-ansible-deployer to integrate opencontrail into k8s"
Diffstat (limited to 'deploy/compass_conf')
| -rwxr-xr-x | deploy/compass_conf/flavor/kubernetes.conf | 4 | ||||
| -rwxr-xr-x | deploy/compass_conf/role/kubernetes_ansible.conf | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/deploy/compass_conf/flavor/kubernetes.conf b/deploy/compass_conf/flavor/kubernetes.conf index e7e8ffc8..2e808a83 100755 --- a/deploy/compass_conf/flavor/kubernetes.conf +++ b/deploy/compass_conf/flavor/kubernetes.conf @@ -4,8 +4,6 @@ FLAVORS = [{ 'display_name': 'ansible-kubernetes', 'template': 'ansible-kubernetes.tmpl', 'roles': [ - 'kube_master', 'etcd', 'kube_node', 'ha', 'storage_master', 'storage_node' + 'kube_master', 'etcd', 'kube_node', 'ha', 'storage_master', 'storage_node', 'opencontrail' ], }] - - diff --git a/deploy/compass_conf/role/kubernetes_ansible.conf b/deploy/compass_conf/role/kubernetes_ansible.conf index 3e79cbb9..87bbaf56 100755 --- a/deploy/compass_conf/role/kubernetes_ansible.conf +++ b/deploy/compass_conf/role/kubernetes_ansible.conf @@ -12,6 +12,10 @@ ROLES = [{ 'display_name': 'kube node', 'description': 'kube Node' }, { + 'role': 'opencontrail', + 'display_name': 'opencontrail node', + 'description': 'opencontrail node' +},{ 'role': 'ha', 'display_name': 'ha', 'description': 'ha' |