Skip to content

Yoga: Fixes for OSSA-2023-002 #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 25, 2023
Merged

Yoga: Fixes for OSSA-2023-002 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
943e80a
Remove trailing white space
priteau Jan 20, 2023
4b5e4c6
Merge pull request #348 from stackhpc/wallaby-whitespace
priteau Jan 20, 2023
9b74850
gitignore .vscode directory
Alex-Welsh Jan 24, 2023
9fae5d6
Make pulp timeout variable
Alex-Welsh Jan 16, 2023
607ea82
Merge pull request #337 from stackhpc/bump-pulp-timeout
markgoddard Jan 24, 2023
60da6b6
Merge pull request #350 from stackhpc/gitignore-vscode
markgoddard Jan 24, 2023
d0f4078
Use StackHPC kolla build sources for Wallaby
m-bull Jan 25, 2023
e881ceb
Merge branch 'wallaby-OSSA-2023-002' into xena-OSSA-2023-002
m-bull Jan 25, 2023
11a17e5
Merge branch 'xena-OSSA-2023-002' into yoga-OSSA-2023-002
m-bull Jan 25, 2023
cec411c
OSSA-2023-002: update cinder, glance & nova images for CentOS & Ubuntu
markgoddard Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pip-log.txt
*~
.*.swp
.*sw?
.vscode/*

# Files generated by Ansible
ansible/*.retry
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/containers/pulp/post.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
url: "{{ pulp_url }}/pulp/api/v3/status/"
register: pulp_status
until: pulp_status is success
retries: 30
delay: 2
retries: "{{ pulp_timeout_retries | default(30) }}"
delay: "{{ pulp_timeout_delay | default(3) }}"

- name: Set the Pulp admin password
become: true
Expand Down
12 changes: 12 additions & 0 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,18 @@ kolla_sources:
type: git
location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
reference: 1.3.0
cinder-base:
type: git
location: https://github.com/stackhpc/cinder.git
reference: stackhpc/{{ openstack_release }}
cloudkitty-base:
type: git
location: https://github.com/stackhpc/cloudkitty.git
reference: stackhpc/{{ openstack_release }}
glance-base:
type: git
location: https://github.com/stackhpc/glance.git
reference: stackhpc/{{ openstack_release }}
horizon-plugin-cloudkitty-dashboard:
type: git
location: https://github.com/stackhpc/cloudkitty-dashboard.git
Expand All @@ -141,6 +149,10 @@ kolla_sources:
type: git
location: https://github.com/stackhpc/networking-generic-switch.git
reference: stackhpc/{{ openstack_release }}
nova-base:
type: git
location: https://github.com/stackhpc/nova.git
reference: stackhpc/{{ openstack_release }}

###############################################################################
# Kolla image build configuration.
Expand Down
6 changes: 6 additions & 0 deletions etc/kayobe/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts

{% if kolla_base_distro == 'centos' %}
bifrost_tag: yoga-20221007T134036
cinder_tag: yoga-20230125T113143
glance_tag: yoga-20230125T113143
magnum_tag: yoga-20230110T142129
neutron_tag: yoga-20230104T155323
nova_tag: yoga-20230125T113143
ovn_tag: yoga-20230119T125748
prometheus_openstack_exporter_tag: yoga-20221128T164623
{% else %}
bifrost_tag: yoga-20221215T142947
cinder_tag: yoga-20230125T114437
glance_tag: yoga-20230125T114437
magnum_tag: yoga-20230110T144737
neutron_tag: yoga-20230104T163118
nova_tag: yoga-20230125T114437
{% endif %}

om_enable_rabbitmq_high_availability: true
Expand Down