Skip to content

Commit aba48f8

Browse files
committed
iter
1 parent db52e19 commit aba48f8

14 files changed

+36
-30
lines changed

etc/kayobe/ansible/build-ofed-rocky.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
- name: Add DOCA host repository package
4444
ansible.builtin.dnf:
45-
name: https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version
46-
}}.x86_64.rpm
45+
name: "https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_\
46+
{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm"
4747
disable_gpg_check: true
4848

4949
- name: Install DOCA extra packages

etc/kayobe/ansible/cephadm-commands-pre.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- cephadm
88
- cephadm-commands
99
tasks:
10-
- name: Apply cephadm role
10+
- name: Apply Cephadm role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.commands
1313
vars:

etc/kayobe/ansible/cephadm-crush-rules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- cephadm
88
- cephadm-crush-rules
99
tasks:
10-
- name: Apply cephadm crush rule role
10+
- name: Apply Cephadm crush rule role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.crush_rules

etc/kayobe/ansible/cephadm-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- cephadm
88
- cephadm-deploy
99
tasks:
10-
- name: Apply cephadm role
10+
- name: Apply Cephadm role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.cephadm

etc/kayobe/ansible/cephadm-ec-profiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- cephadm
88
- cephadm-ec-profiles
99
tasks:
10-
- name: Apply cephadm EC profiles role
10+
- name: Apply Cephadm EC profiles role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.ec_profiles

etc/kayobe/ansible/cephadm-keys.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- name: Apply cephadm keys role
10+
- name: Apply Cephadm keys role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.keys

etc/kayobe/ansible/cephadm-pools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- cephadm
88
- cephadm-keys
99
tasks:
10-
- name: Apply cephadm pools role
10+
- name: Apply Cephadm pools role
1111
ansible.builtin.import_role:
1212
name: stackhpc.cephadm.pools

etc/kayobe/ansible/deploy-os-capacity-exporter.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,18 @@
3131

3232
- name: Set facts for admin credentials
3333
ansible.builtin.set_fact:
34-
stackhpc_os_capacity_auth_url: "{{ credential.stdout_lines | select('match', '.*OS_AUTH_URL*.') | first | split('=') | last | replace(\"'\", '') }}"
35-
stackhpc_os_capacity_project_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_NAME*.') | first | split('=') | last | replace(\"'\", '') }}"
36-
stackhpc_os_capacity_domain_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_DOMAIN_NAME*.') | first | split('=') | last | replace(\"'\"
37-
, '') }}"
38-
stackhpc_os_capacity_openstack_region_name: "{{ credential.stdout_lines | select('match', '.*OS_REGION_NAME*.') | first | split('=') | last | replace(\"'\"\
39-
, '') }}"
40-
stackhpc_os_capacity_username: "{{ credential.stdout_lines | select('match', '.*OS_USERNAME*.') | first | split('=') | last | replace(\"'\", '') }}"
41-
stackhpc_os_capacity_password: "{{ credential.stdout_lines | select('match', '.*OS_PASSWORD*.') | first | split('=') | last | replace(\"'\", '') }}"
34+
stackhpc_os_capacity_auth_url: "{{ credential.stdout_lines | select('match', '.*OS_AUTH_URL*.')\
35+
| first | split('=') | last | replace(\"'\", '') }}"
36+
stackhpc_os_capacity_project_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_NAME*.')\
37+
| first | split('=') | last | replace(\"'\", '') }}"
38+
stackhpc_os_capacity_domain_name: "{{ credential.stdout_lines | select('match', '.*OS_PROJECT_DOMAIN_NAME*.')\
39+
| first | split('=') | last | replace(\"'\", '') }}"
40+
stackhpc_os_capacity_openstack_region_name: "{{ credential.stdout_lines | select('match', '.*OS_REGION_NAME*.')\
41+
| first | split('=') | last | replace(\"'\", '') }}"
42+
stackhpc_os_capacity_username: "{{ credential.stdout_lines | select('match', '.*OS_USERNAME*.')\
43+
| first | split('=') | last | replace(\"'\", '') }}"
44+
stackhpc_os_capacity_password: "{{ credential.stdout_lines | select('match', '.*OS_PASSWORD*.')\
45+
| first | split('=') | last | replace(\"'\", '') }}"
4246
when: stackhpc_enable_os_capacity
4347

4448
- name: Template clouds.yml

etc/kayobe/ansible/pulp-host-image-download.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
# This var is an edited version of stackhpc_overcloud_host_image_url
66
# without the auth credentials in it. Auth is handled by username and
77
# password in the get_url task of this playbook
8-
stackhpc_overcloud_host_image_url_no_auth: "{{ stackhpc_release_pulp_content_url }}/kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release
9-
}}/{{ 'ofed/' if stackhpc_overcloud_host_image_is_ofed else '' }}{{ stackhpc_overcloud_host_image_version }}/overcloud-{{ os_distribution }}-{{ os_release }}{{
10-
'-ofed' if stackhpc_overcloud_host_image_is_ofed else '' }}.qcow2"
11-
8+
stackhpc_overcloud_host_image_url_no_auth: "{{ stackhpc_release_pulp_content_url }}/kayobe-images/\
9+
{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
10+
{{ 'ofed/' if stackhpc_overcloud_host_image_is_ofed else '' }}\
11+
{{ stackhpc_overcloud_host_image_version }}/\
12+
overcloud-{{ os_distribution }}-{{ os_release }}\
13+
{{ '-ofed' if stackhpc_overcloud_host_image_is_ofed else '' }}.qcow2"
1214
tasks:
1315
- name: Print image information
1416
ansible.builtin.debug:

etc/kayobe/ansible/run-container-hotfix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
index_var: index
2222

2323
- name: Run container_hotfix_command
24-
ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec {{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command
25-
}}"
24+
ansible.builtin.command: "{{ kolla_container_engine | default('docker') }} exec \
25+
{{ '-u 0' if container_hotfix_become else '' }} {{ hotfix_container }} {{ container_hotfix_command}}"
2626
when: container_hotfix_command

0 commit comments

Comments
 (0)