summaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf/adapter
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-20 16:44:59 +0800
committerliyuenan <liyuenan@huawei.com>2016-12-22 10:54:34 +0800
commita9041dbf7b68f56169e82de3c37601b7e86867b0 (patch)
tree8364c3b523bc0ac1e8dceda0d66eed4b8d2816f5 /deploy/compass_conf/adapter
parent819912d0379f6cd2b2693c2968576f7514a117c5 (diff)
Change newton_xenial to newton
JIRA: COMPASS-513 Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386 Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/compass_conf/adapter')
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_juno.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_kilo.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_liberty.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_mitaka.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_newton.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_osp9.conf7
8 files changed, 7 insertions, 49 deletions
diff --git a/deploy/compass_conf/adapter/ansible_openstack_juno.conf b/deploy/compass_conf/adapter/ansible_openstack_juno.conf
deleted file mode 100755
index 6d36cd55..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_juno.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_juno'
-DISPLAY_NAME = 'Openstack Juno'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_juno'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_kilo.conf b/deploy/compass_conf/adapter/ansible_openstack_kilo.conf
deleted file mode 100755
index 943453ad..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_kilo.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_kilo'
-DISPLAY_NAME = 'Openstack kilo'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_kilo'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_liberty.conf b/deploy/compass_conf/adapter/ansible_openstack_liberty.conf
deleted file mode 100755
index d181d1c7..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_liberty.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_liberty'
-DISPLAY_NAME = 'Openstack Liberty'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_liberty'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf b/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf
deleted file mode 100755
index 0e53829b..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_mitaka'
-DISPLAY_NAME = 'Openstack Mitaka'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_mitaka'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf b/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf
deleted file mode 100755
index 691ce930..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_mitaka_xenial'
-DISPLAY_NAME = 'Openstack Mitaka Xenial'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_mitaka_xenial'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_newton.conf b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
new file mode 100755
index 00000000..dfc8f1af
--- /dev/null
+++ b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
@@ -0,0 +1,7 @@
+NAME = 'openstack_newton'
+DISPLAY_NAME = 'Openstack Newton'
+PARENT = 'openstack'
+PACKAGE_INSTALLER = 'ansible_installer_newton'
+OS_INSTALLER = 'cobbler'
+SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
+DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf b/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf
deleted file mode 100755
index cd8d2deb..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_newton_xenial'
-DISPLAY_NAME = 'Openstack Mitaka Xenial'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_newton_xenial'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_osp9.conf b/deploy/compass_conf/adapter/ansible_openstack_osp9.conf
deleted file mode 100755
index 81c00a0f..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_osp9.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_osp9'
-DISPLAY_NAME = 'RedHat OSP 9'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_osp9'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)rhel-server-7\.2.*']
-DEPLOYABLE = True