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 --- deploy/compass_conf/adapter/ansible_openstack_juno.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_kilo.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_liberty.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_mitaka.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_newton.conf | 7 +++++++ deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf | 7 ------- deploy/compass_conf/adapter/ansible_openstack_osp9.conf | 7 ------- 8 files changed, 7 insertions(+), 49 deletions(-) delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_juno.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_kilo.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_liberty.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_mitaka.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf create mode 100755 deploy/compass_conf/adapter/ansible_openstack_newton.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf delete mode 100755 deploy/compass_conf/adapter/ansible_openstack_osp9.conf (limited to 'deploy/compass_conf/adapter') 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 -- cgit 1.2.3-korg