From ff4feeb30dcf45321d693bc8c2d8780dad0c63e3 Mon Sep 17 00:00:00 2001 From: baigk Date: Fri, 18 Dec 2015 14:37:41 +0800 Subject: [PATCH] install compass-core in centos7 modify config files so that can install compass-core in centos7 1511 Change-Id: Ic656e8ab088f1dac4bb6c558d3f596a47a1bc6b8 Signed-off-by: baigk --- conf/adapter/ansible_openstack_juno.conf | 2 +- conf/adapter/ansible_openstack_kilo.conf | 2 +- conf/adapter/ansible_openstack_liberty.conf | 2 +- conf/os/centos7.1.conf | 3 --- conf/os/centos7.2.conf | 3 +++ .../openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl | 1 - .../openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl | 1 - .../openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl | 1 - .../profile.tmpl | 0 .../system.tmpl | 0 10 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 conf/os/centos7.1.conf create mode 100644 conf/os/centos7.2.conf rename conf/templates/cobbler/{CentOS-7-Minimal-1503-01-x86_64 => CentOS-7-Minimal-1511-x86_64}/profile.tmpl (100%) rename conf/templates/cobbler/{CentOS-7-Minimal-1503-01-x86_64 => CentOS-7-Minimal-1511-x86_64}/system.tmpl (100%) diff --git a/conf/adapter/ansible_openstack_juno.conf b/conf/adapter/ansible_openstack_juno.conf index de52a059..6d36cd55 100644 --- a/conf/adapter/ansible_openstack_juno.conf +++ b/conf/adapter/ansible_openstack_juno.conf @@ -3,5 +3,5 @@ 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.*1503-01.*'] +SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*'] DEPLOYABLE = True diff --git a/conf/adapter/ansible_openstack_kilo.conf b/conf/adapter/ansible_openstack_kilo.conf index 328a689c..943453ad 100644 --- a/conf/adapter/ansible_openstack_kilo.conf +++ b/conf/adapter/ansible_openstack_kilo.conf @@ -3,5 +3,5 @@ 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.*1503-01.*'] +SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*'] DEPLOYABLE = True diff --git a/conf/adapter/ansible_openstack_liberty.conf b/conf/adapter/ansible_openstack_liberty.conf index be7f656c..d181d1c7 100644 --- a/conf/adapter/ansible_openstack_liberty.conf +++ b/conf/adapter/ansible_openstack_liberty.conf @@ -3,5 +3,5 @@ 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.*1503-01.*'] +SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*'] DEPLOYABLE = True diff --git a/conf/os/centos7.1.conf b/conf/os/centos7.1.conf deleted file mode 100644 index 727d0114..00000000 --- a/conf/os/centos7.1.conf +++ /dev/null @@ -1,3 +0,0 @@ -NAME = 'CentOS-7-Minimal-1503-01-x86_64' -PARENT = 'CentOS' -DEPLOYABLE = True diff --git a/conf/os/centos7.2.conf b/conf/os/centos7.2.conf new file mode 100644 index 00000000..9cc8d329 --- /dev/null +++ b/conf/os/centos7.2.conf @@ -0,0 +1,3 @@ +NAME = 'CentOS-7-Minimal-1511-x86_64' +PARENT = 'CentOS' +DEPLOYABLE = True diff --git a/conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl index 2454b641..264d4397 100644 --- a/conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl @@ -5,4 +5,3 @@ host_key_checking = False callback_plugins = /opt/compass/bin/ansible_callbacks pipelining=True library = /opt/openstack-ansible-modules -ssh_args = -o ControlMaster=no diff --git a/conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl index 3b46926e..81f55aba 100644 --- a/conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl @@ -5,4 +5,3 @@ host_key_checking = False callback_plugins = /opt/compass/bin/ansible_callbacks pipelining=True library = /opt/openstack-ansible-modules -ssh_args = -o ControlMaster=no diff --git a/conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl index 0d80fabb..f8dbfa1b 100644 --- a/conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl @@ -5,4 +5,3 @@ host_key_checking = False callback_plugins = /opt/compass/bin/ansible_callbacks pipelining=True library = /opt/openstack-ansible-modules -ssh_args = -o ControlMaster=no diff --git a/conf/templates/cobbler/CentOS-7-Minimal-1503-01-x86_64/profile.tmpl b/conf/templates/cobbler/CentOS-7-Minimal-1511-x86_64/profile.tmpl similarity index 100% rename from conf/templates/cobbler/CentOS-7-Minimal-1503-01-x86_64/profile.tmpl rename to conf/templates/cobbler/CentOS-7-Minimal-1511-x86_64/profile.tmpl diff --git a/conf/templates/cobbler/CentOS-7-Minimal-1503-01-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-7-Minimal-1511-x86_64/system.tmpl similarity index 100% rename from conf/templates/cobbler/CentOS-7-Minimal-1503-01-x86_64/system.tmpl rename to conf/templates/cobbler/CentOS-7-Minimal-1511-x86_64/system.tmpl