x/compass-core
Code Issues Proposed changes

add opencontrail role

Browse Source 
add the config of role,flavor,inventory about opencontrail

Change-Id: I2d3d42078040f6e698d165a6d3def38d30150da2
Signed-off-by: baigk <baiguoku@huawei.com>
This commit is contained in:
baigk 2016-01-25 18:06:16 +08:00
parent 3cda8600a5
commit 401d3c7d47
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/flavor/openstack_liberty_ansible.conf
View File

@ -25,7 +25,7 @@ FLAVORS = [{
'display_name': 'HA-ansible-multinodes-liberty', 'display_name': 'HA-ansible-multinodes-liberty',
'template': 'HA-ansible-multinodes.tmpl', 'template': 'HA-ansible-multinodes.tmpl',
'roles': [ 'roles': [
'controller', 'compute', 'ha', 'odl', 'onos', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node' 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
], ],
}] }]

5
conf/role/openstack_liberty_ansible.conf
View File

@ -73,6 +73,11 @@ ROLES = [{
'display': 'open network operating system', 'display': 'open network operating system',
'description': 'onos node', 'description': 'onos node',
'optional': True 'optional': True
}, {
'role': 'opencontrail',
'display': 'open contrail',
'description': 'opencontrail node',
'optional': True
}, { }, {
'role': 'ha', 'role': 'ha',
'display': 'Cluster with HA', 'display': 'Cluster with HA',

9
conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl
View File

@ -22,6 +22,9 @@
#if not $isinstance(onoss, list) #if not $isinstance(onoss, list)
#set onoss = [onoss] #set onoss = [onoss]
#end if #end if
#if not $isinstance(opencontrails, list)
#set opencontrails = [opencontrails]
#end if
#if not $isinstance(ceph_adm_list, list) #if not $isinstance(ceph_adm_list, list)
#set ceph_adm_list = [ceph_adm_list] #set ceph_adm_list = [ceph_adm_list]
#end if #end if
@ -65,6 +68,12 @@ $odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_pa
#set onos_hostname = $onos.hostname #set onos_hostname = $onos.hostname
$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password $onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
#end for #end for
[opencontrail]
#for opencontrail in $opencontrails
#set opencontrail_ip = $opencontrail.install.ip
#set opencontrail_hostname = $opencontrail.hostname
$opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password
#end for
[ceph_adm] [ceph_adm]
#for ceph_adm in $ceph_adm_list #for ceph_adm in $ceph_adm_list
#set ceph_adm_ip = $ceph_adm.install.ip #set ceph_adm_ip = $ceph_adm.install.ip