Skip to content
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

Jump to bottom

Use update_containers role to update openstack services container image #1884

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Use update_containers role to update openstack services container image #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion ci/playbooks/build_runner_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@
mode: "0644"
content: |
cifmw_update_containers_ansibleee_image_url: "{{ ansibleee_runner_img }}"
cifmw_update_containers: true
dest: "{{ ansible_user_dir }}/ci-framework-data/artifacts/edpm-ansible.yml"
7 changes: 5 additions & 2 deletions roles/edpm_prepare/tasks/kustomize_and_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,15 @@
).metadata.name
}}

- name: Update BM CSV or Ansibleee CSV to update proper image
- name: Update Openstack containers or BM CSV or Ansibleee CSV to update proper image
when: >-
(cifmw_update_containers_edpm_image_url is defined) or
(cifmw_update_containers_ansibleee_image_url is defined)
(cifmw_update_containers_ansibleee_image_url is defined) or
((cifmw_update_containers_openstack is defined and
cifmw_update_containers_openstack | bool))
vars:
cifmw_update_containers_metadata: "{{ _ctlplane_name }}"
cifmw_update_containers: true
ansible.builtin.include_role:
name: update_containers

Expand Down
6 changes: 5 additions & 1 deletion roles/edpm_prepare/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,12 @@
--namespace={{ cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] }}
--for=jsonpath='{.status.phase}'=Complete --timeout=20m

# Note(chkumar): Keeping set_openstack_containers role
# till we migrate this task to update_containers role
- name: Update OpenStack Services containers Env
when: cifmw_edpm_prepare_update_os_containers | bool
when:
- cifmw_edpm_prepare_update_os_containers | bool
- cifmw_update_containers_openstack is not defined
vars:
cifmw_set_openstack_containers_extra_vars: "{{ cifmw_edpm_prepare_extra_vars }}"
ansible.builtin.include_role:
Expand Down
2 changes: 1 addition & 1 deletion roles/reproducer/tasks/configure_controller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
rejectattr('key', 'equalto', 'cifmw_extras') |
rejectattr('key', 'equalto', 'cifmw_openshift_kubeconfig') |
rejectattr('key', 'equalto', 'cifmw_openshift_token') |
rejectattr('key', 'equalto', 'cifmw_set_openstack_containers_registry') |
rejectattr('key', 'equalto', 'cifmw_update_containers_registry') |
rejectattr('key', 'equalto', 'cifmw_networking_env_definition') |
rejectattr('key', 'match', '^cifmw_use_(?!lvms).*') |
rejectattr('key', 'match', '^cifmw_reproducer.*') |
Expand Down
2 changes: 1 addition & 1 deletion roles/reproducer/templates/content-provider.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
{{
{'cifmw_operator_build_output': cifmw_operator_build_output,
'content_provider_registry_ip': cifmw_rp_registry_ip,
'cifmw_set_openstack_containers_registry:': cifmw_rp_registry_ip
'cifmw_update_containers_registry': cifmw_rp_registry_ip
} | to_nice_yaml
}}
{% endraw %}
Expand Down
1 change: 0 additions & 1 deletion roles/update_containers/templates/update_containers.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ spec:
octaviaHousekeepingImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-octavia-housekeeping:{{ cifmw_update_containers_tag }}
octaviaWorkerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-octavia-worker:{{ cifmw_update_containers_tag }}
openstackClientImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-openstackclient:{{ cifmw_update_containers_tag }}
osContainerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}
ovnControllerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-ovn-controller:{{ cifmw_update_containers_tag }}
ovnControllerOvsImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-ovn-base:{{ cifmw_update_containers_tag }}
ovnNbDbclusterImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-ovn-nb-db-server:{{ cifmw_update_containers_tag }}
Expand Down
3 changes: 0 additions & 3 deletions scenarios/centos-9/edpm_baremetal_deployment_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ pre_infra:
cifmw_operator_build_meta_name: "openstack-operator"
cifmw_edpm_prepare_skip_crc_storage_creation: true

# update containers vars
cifmw_update_containers: true

# edpm_deploy role vars
cifmw_deploy_edpm: true
cifmw_edpm_deploy_baremetal: true
Expand Down
Loading