ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dashboard: support igw nodes with dedicated subnet 

This adds the possibility to deploy the dashboard with igw nodes using
a dedicated subnet.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1926170

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit c33de174f1)
pull/6405/head
Guillaume Abrioux 2021-03-02 09:51:26 +01:00
parent 58a28656ff
commit fe47a02134
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -809,6 +809,8 @@ dummy:
#alertmanager_conf_dir: /etc/alertmanager #alertmanager_conf_dir: /etc/alertmanager
#alertmanager_port: 9093 #alertmanager_port: 9093
#alertmanager_cluster_port: 9094 #alertmanager_cluster_port: 9094
# igw
#igw_network: "{{ public_network }}"
################################## ##################################

2
group_vars/rhcs.yml.sample
View File

@ -809,6 +809,8 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert
#alertmanager_conf_dir: /etc/alertmanager #alertmanager_conf_dir: /etc/alertmanager
#alertmanager_port: 9093 #alertmanager_port: 9093
#alertmanager_cluster_port: 9094 #alertmanager_cluster_port: 9094
# igw
#igw_network: "{{ public_network }}"
################################## ##################################

4
roles/ceph-dashboard/tasks/configure_dashboard.yml
View File

@ -378,7 +378,7 @@
- name: add iscsi gateways - ipv4 - name: add iscsi gateways - ipv4
command: "{{ ceph_cmd }} --cluster {{ cluster }} dashboard iscsi-gateway-add -i -" # noqa 304 command: "{{ ceph_cmd }} --cluster {{ cluster }} dashboard iscsi-gateway-add -i -" # noqa 304
args: args:
stdin: "{{ 'https' if hostvars[item]['api_secure'] | default(false) | bool else 'http' }}://{{ hostvars[item]['api_user'] | default('admin') }}:{{ hostvars[item]['api_password'] | default('admin') }}@{{ hostvars[item]['ansible_facts']['all_ipv4_addresses'] | ips_in_ranges(public_network.split(',')) | first }}:{{ hostvars[item]['api_port'] | default(5000) }}" stdin: "{{ 'https' if hostvars[item]['api_secure'] | default(false) | bool else 'http' }}://{{ hostvars[item]['api_user'] | default('admin') }}:{{ hostvars[item]['api_password'] | default('admin') }}@{{ hostvars[item]['ansible_facts']['all_ipv4_addresses'] | ips_in_ranges(igw_network.split(',')) | first }}:{{ hostvars[item]['api_port'] | default(5000) }}"
stdin_add_newline: no stdin_add_newline: no
changed_when: false changed_when: false
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"
@ -401,7 +401,7 @@
- name: add iscsi gateways - ipv6 - name: add iscsi gateways - ipv6
command: "{{ ceph_cmd }} --cluster {{ cluster }} dashboard iscsi-gateway-add -i -" # noqa 304 command: "{{ ceph_cmd }} --cluster {{ cluster }} dashboard iscsi-gateway-add -i -" # noqa 304
args: args:
stdin: "{{ 'https' if hostvars[item]['api_secure'] | default(false) | bool else 'http' }}://{{ hostvars[item]['api_user'] | default('admin') }}:{{ hostvars[item]['api_password'] | default('admin') }}@{{ hostvars[item]['ansible_facts']['all_ipv6_addresses'] | ips_in_ranges(public_network.split(',')) | last | ipwrap }}:{{ hostvars[item]['api_port'] | default(5000) }}" stdin: "{{ 'https' if hostvars[item]['api_secure'] | default(false) | bool else 'http' }}://{{ hostvars[item]['api_user'] | default('admin') }}:{{ hostvars[item]['api_password'] | default('admin') }}@{{ hostvars[item]['ansible_facts']['all_ipv6_addresses'] | ips_in_ranges(igw_network.split(',')) | last | ipwrap }}:{{ hostvars[item]['api_port'] | default(5000) }}"
stdin_add_newline: no stdin_add_newline: no
changed_when: false changed_when: false
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"

2
roles/ceph-defaults/defaults/main.yml
View File

@ -801,6 +801,8 @@ alertmanager_data_dir: /var/lib/alertmanager
alertmanager_conf_dir: /etc/alertmanager alertmanager_conf_dir: /etc/alertmanager
alertmanager_port: 9093 alertmanager_port: 9093
alertmanager_cluster_port: 9094 alertmanager_cluster_port: 9094
# igw
igw_network: "{{ public_network }}"
################################## ##################################