Skip to content

Commit ba6b5f4

Browse files
obaranovgerritforge-ltd
authored andcommitted
Merge "[BUGFIX] --custom-hostnames too long value"
2 parents 4ec620e + bab1eef commit ba6b5f4

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

plugins/tripleo-overcloud/plugin.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ subparsers:
448448
help: |
449449
Option to provide custom Hostnames for the nodes.
450450
Note: Custom hostnames can be provided as values or a env file.
451-
Value example :
451+
Value example:
452452
--custom-hostnames controller-0=ctr-rack-1-0,compute-0=compute-rack-2-0,ceph-0=ceph-rack-3-0
453453
File example:
454454
--custom-hostnames local/path/to/custom_hostnames.yaml

plugins/tripleo-overcloud/tasks/control_node_placement/custom_hostnames.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,27 @@
44
path: "{{ install.custom.hostnames }}"
55
register: custom_hostname_files
66
delegate_to: localhost
7+
when: install.custom.hostnames.split('/')[-1]|length <= 255
78

8-
- name: validate custom hostnames
9-
fail:
10-
msg: "{{ item }} is not valid value for --custom-hostnames"
11-
when:
12-
- not item.split('=')[1]|default(False)
13-
- not custom_hostname_files.stat.exists
14-
with_items: "{{ install.custom.hostnames.split(',') }}"
9+
- block:
10+
- name: validate custom hostnames
11+
fail:
12+
msg: "{{ item }} is not valid value for --custom-hostnames"
13+
when:
14+
- not item.split('=')[1]|default(False)
15+
with_items: "{{ install.custom.hostnames.split(',') }}"
1516

16-
- name: create custom_hostnames.yaml
17-
template:
18-
src: control_node_placement/custom_hostnames.yaml.j2
19-
dest: "{{ template_base }}/custom_hostnames.yaml"
20-
when: not custom_hostname_files.stat.exists
17+
- name: create custom_hostnames.yaml
18+
template:
19+
src: control_node_placement/custom_hostnames.yaml.j2
20+
dest: "{{ template_base }}/custom_hostnames.yaml"
21+
22+
when: install.custom.hostnames.split('/')[-1]|length > 255 or not custom_hostname_files.stat.exists
2123

2224
- name: copy provided env file for custom hostnames
2325
copy:
2426
src: "{{ install.custom.hostnames }}"
2527
dest: "{{ template_base }}/custom_hostnames.yaml"
26-
when: custom_hostname_files.stat.exists
28+
when:
29+
- install.custom.hostnames.split('/')[-1]|length <= 255
30+
- custom_hostname_files.stat.exists

0 commit comments

Comments
 (0)