diff options
Diffstat (limited to 'deploy/compass_conf')
5 files changed, 71 insertions, 11 deletions
diff --git a/deploy/compass_conf/flavor/openstack_newton.conf b/deploy/compass_conf/flavor/openstack_newton.conf index 2861ccdf..41c6cf2e 100755 --- a/deploy/compass_conf/flavor/openstack_newton.conf +++ b/deploy/compass_conf/flavor/openstack_newton.conf @@ -25,7 +25,7 @@ FLAVORS = [{ 'display_name': 'HA-ansible-multinodes-newton', 'template': 'HA-ansible-multinodes.tmpl', 'roles': [ - 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', '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', 'moon', 'none' ], }] diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf index b07efd4e..509cc5e0 100755 --- a/deploy/compass_conf/package_metadata/openstack.conf +++ b/deploy/compass_conf/package_metadata/openstack.conf @@ -113,14 +113,6 @@ METADATA = { 'default_value': 'Disable' } }, - 'moon': { - '_self': { - 'mapping_to': 'moon', - 'field': 'anytype', - 'is_required':False, - 'default_value': 'Disable' - } - }, 'ha_network': { '_self': { 'mapping_to': 'ha_network', @@ -463,5 +455,50 @@ METADATA = { } } }, - + 'moon_cfg': { + '_self': { + 'required_in_whole_config': False, + 'mapping_to': 'moon_cfg' + }, + 'master': { + '_self': { + 'required_in_whole_config': False, + 'mapping_to': 'master' + }, + 'flag': { + '_self': { + 'is_required': False, + 'field': 'general', + 'mapping_to': 'flag' + } + }, + }, + 'slave': { + '_self': { + 'required_in_whole_config': False, + 'mapping_to': 'slave' + }, + 'flag': { + '_self': { + 'is_required': False, + 'field': 'general', + 'mapping_to': 'flag' + } + }, + 'name': { + '_self': { + 'is_required': False, + 'field': 'general', + 'mapping_to': 'name' + } + }, + 'master_ip': { + '_self': { + 'is_required': False, + 'field': 'general', + 'mapping_to': 'master_ip' + } + }, + } + } } diff --git a/deploy/compass_conf/role/openstack_newton_ansible.conf b/deploy/compass_conf/role/openstack_newton_ansible.conf index 508ccf24..0558a063 100755 --- a/deploy/compass_conf/role/openstack_newton_ansible.conf +++ b/deploy/compass_conf/role/openstack_newton_ansible.conf @@ -112,4 +112,14 @@ ROLES = [{ 'display': 'sec-patch node', 'description': 'Security Patch Node', 'optional': True +}, { + 'role': 'none', + 'display': 'none node', + 'description': 'Only install OS Node', + 'optional': True +}, { + 'role': 'moon', + 'display': 'moon master or slave node', + 'description': "Moon master/slave Node", + 'optional': True }] diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl index 94a6a153..f0dab66a 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl @@ -7,6 +7,7 @@ #set ceph_adm_list = $getVar('ceph_adm',[]) #set ceph_mon_list = $getVar('ceph_mon',[]) #set ceph_osd_list = $getVar('ceph_osd',[]) +#set moon_list = $getVar('moon',[]) #if not $isinstance($controllers, list) #set controllers = [$controllers] @@ -75,6 +76,12 @@ $onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_ #set opencontrail_hostname = $opencontrail.hostname $opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password #end for +[moon] +#for moon in $moon_list + #set moon_ip = $moon.install.ip + #set moon_hostname = $moon.hostname +$moon_hostname ansible_ssh_host=$moon_ip +#end for [ceph_adm] #for ceph_adm in $ceph_adm_list #set ceph_adm_ip = $ceph_adm.install.ip diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl index ac82a981..467c9fc9 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl @@ -30,7 +30,6 @@ enable_secgroup: $getVar('enable_secgroup', True) enable_fwaas: $getVar('enable_fwaas', True) enable_vpnaas: $getVar('enable_vpnaas', True) odl_l3_agent: $getVar('odl_l3_agent', 'Disable') -moon: $getVar('moon', 'Disable') ha_network: $getVar('ha_network', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') onos_sfc: $getVar('onos_sfc', 'Disable') @@ -212,3 +211,10 @@ odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'ma odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi'] odl_features: "{{ odl_base_features + odl_extra_features }}" odl_api_port: 8080 + +#set moon_cfg = $getVar('moon_cfg', {}) +moon_master: $moon_cfg.master.flag +moon_slave: $moon_cfg.slave.flag +moon_slave_name: $moon_cfg.slave.name +moon_master_ip: $moon_cfg.slave.master_ip + |