Skip to content

Commit fb94f3a

Browse files
committed
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
1 parent 2c2e601 commit fb94f3a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

docker/bifrost/bifrost-base/Dockerfile.j2

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ RUN apt-get --error-on=any update && \
4040
{%- else %}
4141
RUN echo " " && \
4242
{%- endif %}
43-
bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./scripts/env-setup.sh && \
44-
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
43+
bash -c 'export VENV=/var/lib/kolla/venv && \
44+
$VENV/bin/pip install "ansible>=6,<7" && \
45+
$VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
46+
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
47+
/bifrost/playbooks/install.yaml \
4548
-e git_branch={{ openstack_branch_slashed }} \
4649
-e ipa_upstream_release={{ openstack_branch }} \
4750
-e @/tmp/build_arg.yml && \

kolla/image/unbuildable.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
# Issues for SHA1 keys:
2626
# https://github.com/grafana/grafana/issues/41036
2727
'centos': {
28-
"bifrost-base", # EPEL-related breakage
2928
"hacluster-pcs", # Missing crmsh package
3029
"nova-spicehtml5proxy", # Missing spicehtml5 package
3130
"ovsdpdk", # Not supported on CentOS
@@ -42,7 +41,6 @@
4241
},
4342

4443
'rocky': {
45-
"bifrost-base", # EPEL-related breakage
4644
"hacluster-pcs", # Missing crmsh package
4745
"nova-spicehtml5proxy", # Missing spicehtml5 package
4846
"ovsdpdk", # Not supported on CentOS

0 commit comments

Comments
 (0)