openstack/tripleo-operator-ansible
Code Issues Proposed changes

Add ntp parameters to ceph deploy

Browse Source 
This patch adds new ntp paramters introduced in [1] to _deploy_cmd
in tripleo_ceph_deploy role.

[1] https://review.opendev.org/c/openstack/python-tripleoclient/+/873867

Depends-On: I85b692c21269f1bb69dabd54c1c2212cb03e2afe
Change-Id: Ic46154e88245e27d78bf646ef9bd008cb7cabb8c
This commit is contained in:
katarimanoj 2023-02-25 16:52:05 +05:30
parent 400a47bdc2
commit 2dfcfff28c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/tripleo_ceph_deploy/defaults/main.yml
View File

@ -23,6 +23,7 @@ tripleo_ceph_deploy_output:
tripleo_ceph_deploy_skip_user_create: false
tripleo_ceph_deploy_skip_hosts_config: false
tripleo_ceph_deploy_skip_container_registry_config: false
tripleo_ceph_deploy_skip_ntp: false
tripleo_ceph_deploy_network_data:
tripleo_ceph_deploy_public_network_name:
tripleo_ceph_deploy_cluster_network_name:
@ -32,6 +33,8 @@ tripleo_ceph_deploy_force: false
tripleo_ceph_deploy_ceph_vip:
tripleo_ceph_deploy_daemons:
tripleo_ceph_deploy_single_host_defaults: false
tripleo_ceph_deploy_ntp_server:
tripleo_ceph_deploy_ntp_heat_env_file:
tripleo_ceph_deploy_container_cephadm_default: false
tripleo_ceph_deploy_container_image_prepare:
tripleo_ceph_deploy_container_namespace:

5
roles/tripleo_ceph_deploy/tasks/main.yml
View File

@ -18,9 +18,12 @@
{{ tripleo_ceph_user_ssh_user | ternary('--cephadm-ssh-user $CEPHADM_SSH_USER', '') }}
{{ tripleo_ceph_deploy_skip_user_create | ternary('--skip-user-create', '') }}
{{ tripleo_ceph_deploy_skip_hosts_config | ternary('--skip-hosts-config', '') }}
{{ tripleo_ceph_deploy_skip_ntp | ternary('--skip-ntp', '') }}
{{ tripleo_ceph_deploy_skip_container_registry_config | ternary('--skip-container-registry-config', '') }}
{{ tripleo_ceph_deploy_force | ternary('--force', '') }}
{{ tripleo_ceph_deploy_single_host_defaults | ternary('--single-host-defaults', '') }}
{{ tripleo_ceph_deploy_ntp_server | ternary('--ntp-server $CEPH_NTP_SERVER', '') }}
{{ tripleo_ceph_deploy_ntp_heat_env_file | ternary('--ntp-heat-env-file $CEPH_NTP_HEAT_ENV_FILE', '') }}
{{ tripleo_ceph_deploy_network_data | ternary('--network-data $NETWORK_DATA', '') }}
{{ tripleo_ceph_deploy_public_network_name | ternary('--public-network-name $PUBLIC_NETWORK_NAME', '') }}
{{ tripleo_ceph_deploy_cluster_network_name | ternary('--cluster-network-name $CLUSTER_NETWORK_NAME', '') }}
@ -45,6 +48,8 @@
CEPH_MON_IP: "{{ tripleo_ceph_deploy_mon_ip }}"
CLUSTER: "{{ tripleo_ceph_deploy_cluster }}"
CEPH_OSD_SPEC: "{{ tripleo_ceph_deploy_osd_spec }}"
CEPH_NTP_SERVER: "{{ tripleo_ceph_deploy_ntp_server }}"
CEPH_NTP_HEAT_ENV_FILE: "{{ tripleo_ceph_deploy_ntp_heat_env_file }}"
CEPH_CRUSH_HIERARCHY: "{{ tripleo_ceph_deploy_crush_hierarchy }}"
CEPHADM_SSH_USER: "{{ tripleo_ceph_user_ssh_user }}"
NETWORK_DATA: "{{ tripleo_ceph_deploy_network_data }}"