Remove UCA/RDO in role
Now that the external repository management is done in pip-install role, we don't need this wiring anymore. Everything will be consistent across all the roles that include pip-install. Change-Id: I30e06acb2762707f77af48e71097e10e18ee3053 Signed-off-by: Jean-Philippe Evrard <jean-philippe@evrard.me>
This commit is contained in:
@@ -372,11 +372,6 @@ nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers
|
||||
# Otherwise keys will be generated on the first run and not regenerated each run.
|
||||
nova_recreate_keys: False
|
||||
|
||||
# Toggle the use of Ubuntu Cloud Archive
|
||||
nova_uca_enable: True
|
||||
# Ubuntu Cloud Archive mirror URL
|
||||
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
|
||||
|
||||
# Nova Ceph rbd
|
||||
# Enble and define nova_libvirt_images_rbd_pool to use rbd as nova backend
|
||||
#nova_libvirt_images_rbd_pool: vms
|
||||
|
||||
@@ -13,40 +13,12 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Ensure apt cache is up to date
|
||||
apt:
|
||||
update_cache: yes
|
||||
cache_valid_time: "{{ cache_timeout }}"
|
||||
|
||||
- name: Add Ubuntu Cloud Archive key package
|
||||
package:
|
||||
name: ubuntu-cloud-keyring
|
||||
state: "{{ nova_package_state }}"
|
||||
when:
|
||||
- nova_uca_enable
|
||||
register: nova_uca_add_keys
|
||||
tags:
|
||||
- add-apt-keys
|
||||
|
||||
- name: Add Ubuntu Cloud Archive apt repository
|
||||
apt_repository:
|
||||
repo: "{{ uca_repo }}"
|
||||
state: present
|
||||
update_cache: yes
|
||||
filename: "{{ uca_apt_source_list_filename | default(omit) }}"
|
||||
register: nova_uca_add_repo
|
||||
when:
|
||||
- nova_uca_enable
|
||||
until: add_repo|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
tags:
|
||||
- add-uca-repo
|
||||
|
||||
- name: Install nova role packages (apt)
|
||||
apt:
|
||||
name: "{{ item }}"
|
||||
state: "{{ nova_package_state }}"
|
||||
update_cache: yes
|
||||
cache_valid_time: "{{ cache_timeout }}"
|
||||
with_items:
|
||||
- "{{ nova_packages_list | selectattr('enabled') | sum(attribute='packages', start=[]) }}"
|
||||
when: item != ''
|
||||
|
||||
@@ -13,17 +13,6 @@
|
||||
# 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
|
||||
when:
|
||||
- ansible_pkg_mgr == 'yum'
|
||||
|
||||
- name: Install nova role packages (yum)
|
||||
yum:
|
||||
name: "{{ item }}"
|
||||
|
||||
@@ -64,8 +64,6 @@ nova_compute_powervm_distro_packages: []
|
||||
|
||||
novalink_gpg_keys: []
|
||||
|
||||
rdo_package: "https://rdoproject.org/repos/rdo-release.rpm"
|
||||
|
||||
nova_nginx_distro_packages:
|
||||
- nginx
|
||||
|
||||
|
||||
@@ -74,12 +74,6 @@ nova_compute_lxd_distro_packages:
|
||||
nova_nginx_distro_packages:
|
||||
- nginx-full
|
||||
|
||||
# Ubuntu Cloud Archive variables
|
||||
uca_openstack_release: ocata
|
||||
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
|
||||
uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
|
||||
#uca_apt_source_list_filename: "ubuntu_cloud_archive_canonical_com_ubuntu"
|
||||
|
||||
# nova powervm virt driver
|
||||
nova_compute_powervm_distro_packages:
|
||||
- bridge-utils
|
||||
|
||||
Reference in New Issue
Block a user