diff --git a/conf/flavor/openstack_liberty_ansible.conf b/conf/flavor/openstack_liberty_ansible.conf index 7d42fe28..21aaa51e 100644 --- a/conf/flavor/openstack_liberty_ansible.conf +++ b/conf/flavor/openstack_liberty_ansible.conf @@ -25,7 +25,7 @@ FLAVORS = [{ 'display_name': 'HA-ansible-multinodes-liberty', 'template': 'HA-ansible-multinodes.tmpl', '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' ], }] diff --git a/conf/role/openstack_liberty_ansible.conf b/conf/role/openstack_liberty_ansible.conf index 604e49f0..c481c8a7 100644 --- a/conf/role/openstack_liberty_ansible.conf +++ b/conf/role/openstack_liberty_ansible.conf @@ -73,6 +73,11 @@ ROLES = [{ 'display': 'open network operating system', 'description': 'onos node', 'optional': True +}, { + 'role': 'opencontrail', + 'display': 'open contrail', + 'description': 'opencontrail node', + 'optional': True }, { 'role': 'ha', 'display': 'Cluster with HA', diff --git a/conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl index 9ec04802..3238ca5c 100644 --- a/conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl @@ -22,6 +22,9 @@ #if not $isinstance(onoss, list) #set onoss = [onoss] #end if +#if not $isinstance(opencontrails, list) + #set opencontrails = [opencontrails] +#end if #if not $isinstance(ceph_adm_list, list) #set ceph_adm_list = [ceph_adm_list] #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 $onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password #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] #for ceph_adm in $ceph_adm_list #set ceph_adm_ip = $ceph_adm.install.ip