From a9041dbf7b68f56169e82de3c37601b7e86867b0 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Tue, 20 Dec 2016 16:44:59 +0800 Subject: Change newton_xenial to newton JIRA: COMPASS-513 Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386 Signed-off-by: liyuenan --- .../inventories/HA-ansible-multinodes.tmpl | 100 ----------------- .../openstack_mitaka/inventories/allinone.tmpl | 47 -------- .../openstack_mitaka/inventories/multinodes.tmpl | 123 --------------------- .../inventories/single-controller.tmpl | 67 ----------- 4 files changed, 337 deletions(-) delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl (limited to 'deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories') diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl deleted file mode 100755 index 94a6a153..00000000 --- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl +++ /dev/null @@ -1,100 +0,0 @@ -#set controllers = $getVar('controller', []) -#set computes = $getVar('compute', []) -#set has = $getVar('ha', []) -#set odls = $getVar('odl', []) -#set onoss = $getVar('onos', []) -#set opencontrails = $getVar('opencontrail', []) -#set ceph_adm_list = $getVar('ceph_adm',[]) -#set ceph_mon_list = $getVar('ceph_mon',[]) -#set ceph_osd_list = $getVar('ceph_osd',[]) - -#if not $isinstance($controllers, list) - #set controllers = [$controllers] -#end if -#if not $isinstance($computes, list) - #set computes = [$computes] -#end if -#if not $isinstance(has, list) - #set has = [has] -#end if -#if not $isinstance(odls, list) - #set odls = [odls] -#end if -#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 -#if not $isinstance(ceph_mon_list, list) - #set ceph_mon_list = [ceph_mon_list] -#end if -#if not $isinstance(ceph_osd_list, list) - #set ceph_osd_list = [ceph_osd_list] -#end if - -#set credentials = $getVar('server_credentials', {}) -#set username = $credentials.get('username', 'root') -#set password = $credentials.get('password', 'root') -[controller] -#for controller in $controllers - #set controller_ip = $controller.install.ip - #set controller_hostname = $controller.hostname -$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[compute] -#for compute in $computes - #set compute_ip = $compute.install.ip - #set compute_hostname = $compute.hostname -$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[ha] -#for ha in $has - #set ha_ip = $ha.install.ip - #set ha_hostname = $ha.hostname -$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[odl] -#for odl in $odls - #set odl_ip = $odl.install.ip - #set odl_hostname = $odl.hostname -$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[onos] -#for onos in $onoss - #set onos_ip = $onos.install.ip - #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 - #set ceph_adm_hostname = $ceph_adm.hostname -$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[ceph_mon] -#for ceph_mon in $ceph_mon_list - #set ceph_mon_ip = $ceph_mon.install.ip - #set ceph_mon_hostname = $ceph_mon.hostname -$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[ceph_osd] -#for ceph_osd in $ceph_osd_list - #set ceph_osd_ip = $ceph_osd.install.ip - #set ceph_osd_hostname = $ceph_osd.hostname -$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[ceph:children] -ceph_adm -ceph_mon -ceph_osd - diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl deleted file mode 100755 index 38e0038b..00000000 --- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl +++ /dev/null @@ -1,47 +0,0 @@ -#set controllers = $getVar('allinone_compute', []) -#set computes = $getVar('allinone_compute', []) -#set storages = $getVar('allinone_compute', []) -#set networks = $getVar('allinone_compute', []) -#if not $isinstance($controllers, list) - #set controllers = [$controllers] -#end if -#if not $isinstance($computes, list) - #set computes = [$computes] -#end if -#if not $isinstance($storages, list) - #set storages = [$storages] -#end if -#if not $isinstance($networks, list) - #set networks = [$networks] -#end if - -#set credentials = $getVar('server_credentials', {}) -#set username = $credentials.get('username', 'root') -#set password = $credentials.get('password', 'root') -[controller] -#for controller in $controllers - #set controller_ip = $controller.management.ip - #set controller_hostname = $controller.hostname -$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[compute] -#for compute in $computes - #set compute_ip = $compute.management.ip - #set compute_hostname = $compute.hostname -$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[network] -#for network in $networks - #set network_ip = $network.management.ip - #set network_hostname = $network.hostname -$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[storage] -#for storage in storages - #set storage_ip = $storage.management.ip - #set storage_hostname = $storage.hostname -$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl deleted file mode 100755 index 7cdfbef3..00000000 --- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl +++ /dev/null @@ -1,123 +0,0 @@ -#set compute_controllers = $getVar('compute_controller', []) -#set compute_workers = $getVar('compute_worker', []) -#set network_servers = $getVar('network_server', []) -#set network_workers = $getVar('network_worker', []) -#set databases = $getVar('database', []) -#set messagings = $getVar('messaging', []) -#set images = $getVar('image', []) -#set dashboards = $getVar('dashboard', []) -#set identities = $getVar('identity', []) -#set storage_controllers = $getVar('storage_controller', []) -#set storage_volumes = $getVar('storage_volume', []) -#if not $isinstance($compute_controllers, list) - #set compute_controllers = [$compute_controllers] -#end if -#if not $isinstance($compute_workers, list) - #set compute_workers = [$compute_workers] -#end if -#if not $isinstance($network_servers, list) - #set network_servers = [$network_servers] -#end if -#if not $isinstance($network_workers, list) - #set network_workers = [$network_workers] -#end if -#if not $isinstance($databases, list) - #set databases = [$databases] -#end if -#if not $isinstance($messagings, list) - #set messagings = [$messagings] -#end if -#if not $isinstance($images, list) - #set images = [$images] -#end if -#if not $isinstance($dashboards, list) - #set dashboards = [$dashboards] -#end if -#if not $isinstance($identities, list) - #set identities = [$identities] -#end if -#if not $isinstance($storage_controllers, list) - #set storage_controllers = [$storage_controllers] -#end if -#if not $isinstance($storage_volumes, list) - #set storage_volumes = [$storage_volumes] -#end if -#set credentials = $getVar('server_credentials', {}) -#set username = $credentials.get('username', 'root') -#set password = $credentials.get('password', 'root') -[compute-controller] -#for controller in $compute_controllers - #set controller_ip = $controller.management.ip - #set controller_hostname = $controller.hostname -$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[compute-worker] -#for compute in $compute_workers - #set compute_ip = $compute.management.ip - #set compute_hostname = $compute.hostname -$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[network-server] -#for network in $network_servers - #set network_ip = $network.management.ip - #set network_hostname = $network.hostname -$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[network-worker] -#for network in $network_workers - #set network_ip = $network.management.ip - #set network_hostname = $network.hostname -$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[database] -#for worker in $databases - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[messaging] -#for worker in $messagings - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[image] -#for worker in $images - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[dashboard] -#for worker in $dashboards - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[identity] -#for worker in $identities - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[storage-controller] -#for worker in $storage_controllers - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[storage-volume] -#for worker in $storage_volumes - #set worker_ip = $worker.management.ip - #set worker_hostname = $worker.hostname -$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl deleted file mode 100755 index e1bf72c4..00000000 --- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl +++ /dev/null @@ -1,67 +0,0 @@ -#set controllers = $getVar('controller', []) -#set computes = $getVar('compute', []) -#set storages = $getVar('storage', []) -#set networks = $getVar('network', []) -#set odls = $getVar('odl', []) -#set onoss = $getVar('onos', []) -#if not $isinstance($controllers, list) - #set controllers = [$controllers] -#end if -#if not $isinstance($computes, list) - #set computes = [$computes] -#end if -#if not $isinstance($storages, list) - #set storages = [$storages] -#end if -#if not $isinstance($networks, list) - #set networks = [$networks] -#end if -#if not $isinstance($odls, list) - #set odls = [$odls] -#end if -#if not $isinstance($onoss, list) - #set onoss = [$onoss] -#end if - -#set credentials = $getVar('server_credentials', {}) -#set username = $credentials.get('username', 'root') -#set password = $credentials.get('password', 'root') -[controller] -#for controller in $controllers - #set controller_ip = $controller.management.ip - #set controller_hostname = $controller.hostname -$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[compute] -#for compute in $computes - #set compute_ip = $compute.management.ip - #set compute_hostname = $compute.hostname -$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[network] -#for network in $networks - #set network_ip = $network.management.ip - #set network_hostname = $network.hostname -$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for - -[storage] -#for storage in storages - #set storage_ip = $storage.management.ip - #set storage_hostname = $storage.hostname -$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[odl] -#for odl in odls - #set odl_ip = $odl.management.ip - #set odl_hostname = $odl.hostname -$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -[storage] -#for storage in storages - #set storage_ip = $storage.management.ip - #set storage_hostname = $storage.hostname -$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password -#end for -- cgit 1.2.3-korg