summaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/compass_conf')
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_newton.conf2
-rwxr-xr-xdeploy/compass_conf/os/centos7.0.conf3
-rwxr-xr-xdeploy/compass_conf/os/centos7.3.conf3
-rwxr-xr-xdeploy/compass_conf/os/rhel7.2.conf3
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/profile.tmpl (renamed from deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/system.tmpl (renamed from deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl)0
6 files changed, 4 insertions, 7 deletions
diff --git a/deploy/compass_conf/adapter/ansible_openstack_newton.conf b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
index dfc8f1af..0e90e7bc 100755
--- a/deploy/compass_conf/adapter/ansible_openstack_newton.conf
+++ b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
@@ -3,5 +3,5 @@ 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.*']
+SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-16\.04', '(?i)CentOS-7.*16.*']
DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/centos7.0.conf b/deploy/compass_conf/os/centos7.0.conf
deleted file mode 100755
index 9dcdf753..00000000
--- a/deploy/compass_conf/os/centos7.0.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'CentOS-7.0-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/centos7.3.conf b/deploy/compass_conf/os/centos7.3.conf
new file mode 100755
index 00000000..f814f44d
--- /dev/null
+++ b/deploy/compass_conf/os/centos7.3.conf
@@ -0,0 +1,3 @@
+NAME = 'CentOS-7-Minimal-1611-x86_64'
+PARENT = 'CentOS'
+DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/rhel7.2.conf b/deploy/compass_conf/os/rhel7.2.conf
deleted file mode 100755
index bcb5f581..00000000
--- a/deploy/compass_conf/os/rhel7.2.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'rhel-server-7.2-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/profile.tmpl
index cfa89004..cfa89004 100755
--- a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/profile.tmpl
+++ b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/profile.tmpl
diff --git a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/system.tmpl
index 8e4cbbbe..8e4cbbbe 100755
--- a/deploy/compass_conf/templates/cobbler/rhel-server-7.2-x86_64/system.tmpl
+++ b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1611-x86_64/system.tmpl