Change newton_xenial to newton

JIRA: COMPASS-513

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

7 files changed, 2 insertions, 80 deletions

diff --git a/deploy/compass_conf/package_installer/ansible-kilo.conf b/deploy/compass_conf/package_installer/ansible-kilo.conf
deleted file mode 100755
index cfe21478..00000000
--- a/deploy/compass_conf/package_installer/ansible-kilo.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_kilo'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_kilo/templates','openstack_kilo/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-liberty.conf b/deploy/compass_conf/package_installer/ansible-liberty.conf
deleted file mode 100755
index f0c8fb39..00000000
--- a/deploy/compass_conf/package_installer/ansible-liberty.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_liberty'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_liberty/templates','openstack_liberty/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-mitaka.conf b/deploy/compass_conf/package_installer/ansible-mitaka.conf
deleted file mode 100755
index e83f8886..00000000
--- a/deploy/compass_conf/package_installer/ansible-mitaka.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_mitaka'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_mitaka/templates','openstack_mitaka/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf b/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf
deleted file mode 100755
index 03c3b3bb..00000000
--- a/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_mitaka_xenial'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_mitaka_xenial/templates','openstack_mitaka_xenial/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-juno.conf b/deploy/compass_conf/package_installer/ansible-newton.conf
index 0c74b2ed..242193fb 100755
--- a/deploy/compass_conf/package_installer/ansible-juno.conf
+++ b/deploy/compass_conf/package_installer/ansible-newton.conf
@@ -1,5 +1,5 @@
 NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_juno'
+INSTANCE_NAME = 'ansible_installer_newton'
 SETTINGS = {
     'ansible_dir': '/var/ansible',
     'ansible_run_dir': '/var/ansible/run',
@@ -8,6 +8,6 @@ SETTINGS = {
     'inventory_file': 'inventory.yml',
     'group_variable': 'all',
     'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_juno/templates','openstack_juno/roles']
+    'runner_dirs': ['roles','openstack_newton/templates','openstack_newton/roles']
 }
 
diff --git a/deploy/compass_conf/package_installer/ansible-newton_xenial.conf b/deploy/compass_conf/package_installer/ansible-newton_xenial.conf
deleted file mode 100755
index d51f167d..00000000
--- a/deploy/compass_conf/package_installer/ansible-newton_xenial.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_newton_xenial'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_newton_xenial/templates','openstack_newton_xenial/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-osp9.conf b/deploy/compass_conf/package_installer/ansible-osp9.conf
deleted file mode 100755
index 65f83515..00000000
--- a/deploy/compass_conf/package_installer/ansible-osp9.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_osp9'
-SETTINGS = {
-    'ansible_dir': '/var/ansible',
-    'ansible_run_dir': '/var/ansible/run',
-    'ansible_config': 'ansible.cfg',
-    'playbook_file': 'site.yml',
-    'inventory_file': 'inventory.yml',
-    'group_variable': 'all',
-    'etc_hosts_path': 'roles/common/templates/hosts',
-    'runner_dirs': ['roles','openstack_osp9/templates','openstack_osp9/roles']
-}
-