Skip to content

Commit e3756d9

Browse files
Valkyrie00evallesp
authored andcommitted
feat: replace hardcoded /home/zuul with a dedicated variable
1 parent 924f688 commit e3756d9

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

roles/cifmw_cephadm/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Requires an Ansible user who can become root to install Ceph server.
3333
The `hooks/playbooks/ceph.yml` hook playbook defaults these parameters so
3434
that they do not need to be changed for a typical EDPM deployment.
3535

36+
* `cifmw_cephadm_basedir`: (String) Base directory for artifacts and logs. Defaults to `cifmw_basedir`, which defaults to `{{ ansible_user_dir ~ '/ci-framework-data' }}`.
37+
3638
* `cifmw_cephadm_default_container`: If this is value is `true`, then
3739
`cephadm bootstrap` is not passed the `--image` parameter and whatever
3840
default Ceph container defined inside of `cephadm` is used. Otherwise

roles/cifmw_cephadm/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
# defaults file for cifmw_cephadm
3+
cifmw_cephadm_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
34
cifmw_cephadm_spec_on_bootstrap: false # not recommended due to https://tracker.ceph.com/issues/49277
45
cifmw_cephadm_ssh_user: ceph-admin
56
cifmw_cephadm_bin: /usr/sbin/cephadm

roles/cifmw_cephadm/tasks/configure_object.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
cifmw.general.ci_script:
5050
extra_args:
5151
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
52-
output_dir: "/home/zuul/ci-framework-data/artifacts"
52+
output_dir: "{{ cifmw_cephadm_basedir }}/artifacts"
5353
script: |-
5454
oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack service create --name swift --description 'OpenStack Object Storage' object-store
5555
oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack user create --project {{ project_service_uuid.stdout }} --password {{ cifmw_ceph_rgw_keystone_psw }} swift
@@ -119,7 +119,7 @@
119119
cifmw.general.ci_script:
120120
extra_args:
121121
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
122-
output_dir: "/home/zuul/ci-framework-data/artifacts"
122+
output_dir: "{{ cifmw_cephadm_basedir }}/artifacts"
123123
script: |-
124124
oc -n {{ cifmw_cephadm_ns }} rsh openstackclient \
125125
openstack endpoint set \
@@ -142,7 +142,7 @@
142142
cifmw.general.ci_script:
143143
extra_args:
144144
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
145-
output_dir: "/home/zuul/ci-framework-data/artifacts"
145+
output_dir: "{{ cifmw_cephadm_basedir }}/artifacts"
146146
script: |-
147147
oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack role add --user {{ all_uuids.results.0.stdout }} --project {{ project_service_uuid.stdout }} {{ all_uuids.results.2.stdout }}
148148
oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack role add --user {{ all_uuids.results.0.stdout }} --project {{ project_service_uuid.stdout }} {{ all_uuids.results.3.stdout }}

0 commit comments

Comments
 (0)