diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-28 11:11:51 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-12-04 10:54:26 +0000 |
| commit | fb94f3aff78f56b1f854951ff9cc8738c6180091 (patch) | |
| tree | 5032a9495c524a08231efb66636dcf998784d012 | |
| parent | 2c2e601e78112b22444d5a7a3e58fc31d1fec7de (diff) | |
| download | kolla-fb94f3aff78f56b1f854951ff9cc8738c6180091.tar.gz kolla-fb94f3aff78f56b1f854951ff9cc8738c6180091.zip | |
bifrost: Don't use env-setup
env-setup script removes epel-release and this
breaks our CI template overrides.
It is also more geared towards using in opendev
CI - let's just install proper Ansible version
instead.
Change-Id: I68f645bef05dd15eba41479e3ef6713100fb87d0
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 2aa536cca..b44668726 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -40,8 +40,11 @@ RUN apt-get --error-on=any update && \ {%- else %} RUN echo " " && \ {%- endif %} - bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./scripts/env-setup.sh && \ - ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ + bash -c 'export VENV=/var/lib/kolla/venv && \ + $VENV/bin/pip install "ansible>=6,<7" && \ + $VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \ + ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \ + /bifrost/playbooks/install.yaml \ -e git_branch={{ openstack_branch_slashed }} \ -e ipa_upstream_release={{ openstack_branch }} \ -e @/tmp/build_arg.yml && \ diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 23e2344fe..6095f8c42 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -25,7 +25,6 @@ UNBUILDABLE_IMAGES = { # Issues for SHA1 keys: # https://github.com/grafana/grafana/issues/41036 'centos': { - "bifrost-base", # EPEL-related breakage "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS @@ -42,7 +41,6 @@ UNBUILDABLE_IMAGES = { }, 'rocky': { - "bifrost-base", # EPEL-related breakage "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS |