commit 3ffa57d5611a170637cbd939e46dab434e216f80 Author: Jonathan Rosser Date: Tue Jul 21 10:34:16 2020 +0100 Remove support for Centos-7 Openstack-ansible does not support Centos-7 beyond Ussuri so drop support for Victoria. Depends-On: https://review.opendev.org/742166 Depends-On: https://review.opendev.org/742103 Change-Id: I6f72eb69f54ae780712831dbcb2f9151478e8b83 diff --git a/meta/main.yml b/meta/main.yml index 6161626..4ef8a27 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -28,7 +28,7 @@ galaxy_info: - bionic - name: EL versions: - - 7 + - 8 - name: opensuse versions: - 15.0 diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml deleted file mode 100644 index 9ff3397..0000000 --- a/vars/redhat-7.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -lxc_container_map: - distro: centos - arch: amd64 - release: 7 - -lxc_container_default_config_list: - - "lxc.start.auto=1" - - "lxc.start.delay=15" - - "lxc.group=onboot" - - "lxc.group=openstack" - - "lxc.autodev=1" - - "lxc.pts=1024" - - "lxc.kmsg=0" - - "lxc.hook.autodev=/var/lib/lxc/{{ inventory_hostname }}/autodev" diff --git a/vars/redhat-8.yml b/vars/redhat-8.yml deleted file mode 100644 index 7b25127..0000000 --- a/vars/redhat-8.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -lxc_container_map: - distro: centos - arch: amd64 - release: 8 - -lxc_container_default_config_list: - - "lxc.start.auto=1" - - "lxc.start.delay=15" - - "lxc.group=onboot" - - "lxc.group=openstack" - - "lxc.autodev=1" - - "lxc.hook.autodev=/var/lib/lxc/{{ inventory_hostname }}/autodev" diff --git a/vars/redhat.yml b/vars/redhat.yml new file mode 100644 index 0000000..7b25127 --- /dev/null +++ b/vars/redhat.yml @@ -0,0 +1,27 @@ +--- +# Copyright 2016, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +lxc_container_map: + distro: centos + arch: amd64 + release: 8 + +lxc_container_default_config_list: + - "lxc.start.auto=1" + - "lxc.start.delay=15" + - "lxc.group=onboot" + - "lxc.group=openstack" + - "lxc.autodev=1" + - "lxc.hook.autodev=/var/lib/lxc/{{ inventory_hostname }}/autodev" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 382dda7..c68ae9c 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -27,4 +27,5 @@ - openstack-ansible-zfs-ubuntu-bionic gate: jobs: + - openstack-ansible-dir-centos-8 - openstack-ansible-dir-ubuntu-bionic