Skip to content

mgr/cephadm: try to get FQDN for configuration files#45333

Merged
adk3798 merged 2 commits intoceph:masterfrom
s0nea:config-fqdn
Mar 22, 2022
Merged

mgr/cephadm: try to get FQDN for configuration files#45333
adk3798 merged 2 commits intoceph:masterfrom
s0nea:config-fqdn

Conversation

@s0nea
Copy link
Member

@s0nea s0nea commented Mar 10, 2022

Try to get the FQDN for an inventory address when generating configuration files. If it's not available fall back to the information from the inventory.

Fixes: https://tracker.ceph.com/issues/54502
Signed-off-by: Tatjana Dehler tdehler@suse.com

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@votdev
Copy link
Member

votdev commented Mar 10, 2022

jenkins test make check

Copy link
Contributor

@p-se p-se left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@s0nea
Copy link
Member Author

s0nea commented Mar 10, 2022

jenkins test make check

Copy link
Contributor

@pcuzner pcuzner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one niggle

Copy link
Member

@votdev votdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DELETE ME

Copy link
Member

@votdev votdev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
The URLs are using FQDN where possible:

...
receivers:
- name: default
- name: ceph-dashboard
  webhook_configs:
  - send_resolved: true
    http_config: {}
    url: https://10.20.154.201:8443//api/prometheus_receiver
    max_alerts: 0
  - send_resolved: true
    http_config: {}
    url: https://node2.ses7p-default.test:8443/api/prometheus_receiver
    max_alerts: 0
  - send_resolved: true
    http_config: {}
    url: https://node3.ses7p-default.test:8443/api/prometheus_receiver
    max_alerts: 0
- name: snmp-gateway
  webhook_configs:
  - send_resolved: true
    http_config: {}
    url: http://master.ses7p-default.test:9464/alerts
    max_alerts: 0

@s0nea
Copy link
Member Author

s0nea commented Mar 15, 2022

jenkins test make check

@mgfritch
Copy link
Contributor

jenkins test make check

@s0nea
Copy link
Member Author

s0nea commented Mar 16, 2022

jenkins test make check

Tatjana Dehler added 2 commits March 18, 2022 15:54
There are two different ways to get the host address. From the
inventory of the mgr object directly or via the `_inventory_get_addr`
method of `CephadmService`. Update the code in order to use the
`_inventory_get_addr` method only.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
Fixes: https://tracker.ceph.com/issues/54502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
@s0nea
Copy link
Member Author

s0nea commented Mar 21, 2022

jenkins test docs

@s0nea
Copy link
Member Author

s0nea commented Mar 21, 2022

jenkins render docs

@s0nea
Copy link
Member Author

s0nea commented Mar 21, 2022

jenkins test make check arm64

@adk3798
Copy link
Contributor

adk3798 commented Mar 22, 2022

http://pulpito.front.sepia.ceph.com/adking-2022-03-21_05:58:33-orch:cephadm-wip-adk-testing-2022-03-20-2156-distro-basic-smithi/

1 Dead job due to failing to power on a machine
2 Failed jobs due to unknown flag: --sort caused by another PR in the run
1 Failed job due to Error EINVAL: Invalid service 'ingress.nfs.test'. Use 'ceph orch ls' to list available services caused by another PR in the run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants