Remove special extra repo setup from AIO bootstrap
The AIO bootstrap should not need to use anything from the special cloud repositories. It should just simply use the base OS and only things available in the base OS. Having to add the extra repositories in the AIO bootstrap would mean that deployers would need to add them themselves for production, and this is not what our docs tell them. The openstack-hosts playbook will set these up correctly when the time is right. By removing this we test the promise that deployers don't need these pre-setup, and we also reduce var definition duplication for the RDO and OBS repositories. Change-Id: I2bcf1cb9f9526d61ce0ae9fb092c6b5b3baa3bbb
This commit is contained in:
parent
112e745f71
commit
fe1519e666
@ -13,10 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: "install_packages_{{ ansible_os_family | lower }}.yml"
|
||||
when:
|
||||
- ansible_pkg_mgr != 'apt'
|
||||
|
||||
- name: Remove known problem packages
|
||||
package:
|
||||
name: "{{ packages_remove }}"
|
||||
|
@ -1,23 +0,0 @@
|
||||
---
|
||||
# Copyright 2015, 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.
|
||||
|
||||
- name: Install RDO package
|
||||
package:
|
||||
name: "{{ rdo_package }}"
|
||||
state: "present"
|
||||
register: install_cloud_rdo_package
|
||||
until: install_cloud_rdo_package | success
|
||||
retries: 5
|
||||
delay: 2
|
@ -1,25 +0,0 @@
|
||||
---
|
||||
# Copyright 2015, 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.
|
||||
|
||||
- name: Add zypper cloud repositories
|
||||
zypper_repository:
|
||||
auto_import_keys: yes
|
||||
autorefresh: yes
|
||||
name: "{{ item.name }}"
|
||||
repo: "{{ item.uri }}"
|
||||
runrefresh: yes
|
||||
with_items: "{{ opensuse_openstack_repos }}"
|
||||
retries: 5
|
||||
delay: 2
|
@ -13,8 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
rdo_package: "https://rdoproject.org/repos/openstack-queens/rdo-release-queens.rpm"
|
||||
|
||||
packages_install:
|
||||
- bridge-utils
|
||||
- btrfs-progs
|
||||
|
@ -14,10 +14,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
opensuse_openstack_repos:
|
||||
- name: "OBS:Cloud:OpenStack:Queens"
|
||||
uri: "http://download.opensuse.org/repositories/Cloud:/OpenStack:/Queens/openSUSE_Leap_{{ ansible_distribution_version }}"
|
||||
|
||||
packages_install:
|
||||
- bridge-utils
|
||||
- btrfsprogs
|
||||
|
Loading…
Reference in New Issue
Block a user