From a9041dbf7b68f56169e82de3c37601b7e86867b0 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
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 <liyuenan@huawei.com>
---
 .../hosts/HA-ansible-multinodes.tmpl               |  31 ------
 .../openstack_liberty/hosts/allinone.tmpl          |  10 --
 .../openstack_liberty/hosts/multinodes.tmpl        | 110 ---------------------
 .../openstack_liberty/hosts/single-controller.tmpl |  40 --------
 4 files changed, 191 deletions(-)
 delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
 delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl
 delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl
 delete mode 100755 deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl

(limited to 'deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts')

diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
-    #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
-    #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
-    #set worker_hostname = $worker.hostname
-    #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
-    #set worker_hostname = $worker.hostname
-    #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
-    #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
-    #set controller_ip = $controller.management.ip
-    #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +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
-# compute-controller
-#for worker in $compute_controllers
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#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
-# controller
-#for controller in $controllers
-    #set controller_ip = $controller.management.ip
-    #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
-    #set worker_ip = $worker.management.ip
-    #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-- 
cgit 1.2.3-korg