hopes and prayers

This commit is contained in:
Neil Hanlon 2022-02-07 10:32:36 -05:00
parent 41a84ab580
commit 80e26c806e
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
4 changed files with 49 additions and 3 deletions

View File

@ -0,0 +1,24 @@
diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml
index 3002c22..523b867 100644
--- a/tasks/nova_install.yml
+++ b/tasks/nova_install.yml
@@ -38,12 +38,18 @@
tags:
- nova-pip-packages
+- name: Retrieve the constraints URL
+ uri:
+ url: "{{ nova_upper_constraints_url }}"
+ return_content: yes
+ register: _u_c_contents
+
- name: Install the python venv
import_role:
name: "python_venv_build"
vars:
venv_python_executable: "{{ nova_venv_python_executable }}"
- venv_build_constraints: "{{ nova_git_constraints }}"
+ venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '^(futures|pypowervm)') | list }}"
venv_build_distro_package_list: "{{ nova_devel_distro_packages }}"
venv_install_destination_path: "{{ nova_bin | dirname }}"
venv_pip_install_args: "{{ nova_pip_install_args }}"

View File

@ -3,6 +3,11 @@ lxc_container_base_name: "rocky-8-amd64"
lxc_hosts_container_build_command: "dnf --assumeyes --installroot=/var/lib/machines/{{ lxc_container_base_name }} install --setopt=install_weak_deps=False --nodocs rootfiles coreutils dnf rocky-release rocky-repos --releasever=8"
lxc_container_map:
distro: rockylinux
architecture: amd64
arch: amd64
release: 8
lxc_cache_map:
distro: rockylinux
arch: "{{ lxc_architecture_mapping.get( ansible_facts['architecture'] ) }}"

View File

@ -123,7 +123,7 @@
tags: repos
- name: fetch patch
ansible.builtin.shell: 'git fetch https://review.opendev.org/openstack/openstack-ansible refs/changes/73/823573/5 && git checkout FETCH_HEAD'
ansible.builtin.shell: 'git fetch https://review.opendev.org/openstack/openstack-ansible refs/changes/73/823573/6 && git checkout FETCH_HEAD'
args:
chdir: /opt/openstack-ansible/

View File

@ -82,12 +82,14 @@
debug:
var: aio_install
- name: Run bootstrap ansible with included args
- name: Run bootstrap aio with included args
ansible.builtin.shell: scripts/bootstrap-aio.sh
become: true
args:
chdir: /opt/openstack-ansible/
creates: /etc/openstack_deploy/
environment:
SCENARIO: "{{ SCENARIO | default('') }}"
tags:
- bootstrap
- aio
@ -109,7 +111,7 @@
- user_debug
tags: config
- name: fuck my entire life
- name: manually patch lxc_hosts role to bring in powertools repo
ansible.builtin.copy:
src: "files/{{ item }}.yml"
dest: /etc/ansible/roles/lxc_hosts/tasks/
@ -118,6 +120,21 @@
- lxc_install_dnf
tags: config
- name: manually patch os_nova role to kill powervmtools and futures== requiresments
ansible.builtin.copy:
src: "files/{{ item }}"
dest: /tmp/
mode: '0644'
with_items:
- os_nova.patch
tags: config
- name: patch the thing
args:
chdir: /etc/ansible/roles/os_nova/
ansible.builtin.shell: patch -p1 < /tmp/os_nova.patch
when: do_patch | bool
- name: Disable SSH Agent Forwarding
lineinfile:
dest: /etc/ssh/sshd_config