Change newton_xenial to newton

JIRA: COMPASS-513

Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386
Signed-off-by: liyuenan <liyuenan@huawei.com>

7 files changed, 1 insertions, 681 deletions

diff --git a/deploy/compass_conf/role/openstack_juno_ansible.conf b/deploy/compass_conf/role/openstack_juno_ansible.conf
deleted file mode 100755
index 48c171cf..00000000
--- a/deploy/compass_conf/role/openstack_juno_ansible.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-ADAPTER_NAME = 'openstack_juno'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    'display': 'open network operating system',
-    'description': 'onos node',
-    'optional': True
-}, {
-    'role': 'ha',
-    'display': 'Cluster with HA',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_kilo_ansible.conf b/deploy/compass_conf/role/openstack_kilo_ansible.conf
deleted file mode 100755
index ac3af5a3..00000000
--- a/deploy/compass_conf/role/openstack_kilo_ansible.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-ADAPTER_NAME = 'openstack_kilo'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    'display': 'open network operating system',
-    'description': 'onos node',
-    'optional': True
-}, {
-    'role': 'ha',
-    'display': 'Cluster with HA',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_liberty_ansible.conf b/deploy/compass_conf/role/openstack_liberty_ansible.conf
deleted file mode 100755
index c481c8a7..00000000
--- a/deploy/compass_conf/role/openstack_liberty_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_liberty'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    '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',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_mitaka_ansible.conf b/deploy/compass_conf/role/openstack_mitaka_ansible.conf
deleted file mode 100755
index 4ab8dac5..00000000
--- a/deploy/compass_conf/role/openstack_mitaka_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    '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',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf b/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf
deleted file mode 100755
index 3448eb75..00000000
--- a/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka_xenial'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    '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',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_osp9_ansible.conf b/deploy/compass_conf/role/openstack_newton_ansible.conf
index 0a5f67b3..508ccf24 100755
--- a/deploy/compass_conf/role/openstack_osp9_ansible.conf
+++ b/deploy/compass_conf/role/openstack_newton_ansible.conf
@@ -1,4 +1,4 @@
-ADAPTER_NAME = 'openstack_osp9'
+ADAPTER_NAME = 'openstack_newton'
 ROLES = [{
     'role': 'allinone-compute',
     'display_name': 'all in one',
diff --git a/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf b/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf
deleted file mode 100755
index 385f025f..00000000
--- a/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_newton_xenial'
-ROLES = [{
-    'role': 'allinone-compute',
-    'display_name': 'all in one',
-    'description': 'All in One'
-}, {
-    'role': 'controller',
-    'display_name': 'controller node',
-    'description': 'Controller Node'
-}, {
-    'role': 'compute',
-    'display_name': 'compute node',
-    'description': 'Compute Node'
-}, {
-    'role': 'storage',
-    'display_name': 'storage node',
-    'description': 'Storage Node'
-}, {
-    'role': 'network',
-    'display_name': 'network node',
-    'description': 'Network Node'
-}, {
-    'role': 'compute-worker',
-    'display_name': 'Compute worker node',
-    'description': 'Compute worker node'
-}, {
-    'role': 'compute-controller',
-    'display_name': 'Compute controller node',
-    'description': 'Compute controller node'
-}, {
-    'role': 'network-server',
-    'display_name': 'Network server node',
-    'description': 'Network server node'
-}, {
-    'role': 'database',
-    'display_name': 'Database node',
-    'description': 'Database node'
-}, {
-    'role': 'messaging',
-    'display_name': 'Messaging queue node',
-    'description': 'Messaging queue node'
-}, {
-    'role': 'image',
-    'display': 'Image node',
-    'description': 'Image node'
-}, {
-    'role': 'dashboard',
-    'display': 'Dashboard node',
-    'description': 'Dashboard node'
-}, {
-    'role': 'identity',
-    'display': 'Identity node',
-    'description': 'Identity node'
-}, {
-    'role': 'storage-controller',
-    'display': 'Storage controller node',
-    'description': 'Storage controller node'
-}, {
-    'role': 'storage-volume',
-    'display': 'Storage volume node',
-    'description': 'Storage volume node'
-}, {
-    'role': 'network-worker',
-    'display': 'Network worker node',
-    'description': 'Network worker node'
-}, {
-    'role': 'odl',
-    'display': 'open day light',
-    'description': 'odl node',
-    'optional': True
-}, {
-    'role': 'onos',
-    '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',
-    'description': 'Cluster with HA node'
-}, {
-    'role': 'ceph-adm',
-    'display': 'Ceph Admin Node',
-    'description': 'Ceph Admin Node',
-    'optional': True
-}, {
-    'role': 'ceph-mon',
-    'display': 'Ceph Monitor Node',
-    'description': 'Ceph Monitor Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd',
-    'display': 'Ceph Storage Node',
-    'description': 'Ceph Storage Node',
-    'optional': True
-}, {
-    'role': 'ceph-osd-node',
-    'display': 'Ceph osd install from node',
-    'description': '',
-    'optional': True
-}, {
-    'role': 'ceph',
-    'display': 'ceph node',
-    'description': 'ceph node',
-    'optional': True
-}, {
-    'role': 'sec-patch',
-    'display': 'sec-patch node',
-    'description': 'Security Patch Node',
-    'optional': True
-}]