openstack/tripleo-operator-ansible
Code Issues Proposed changes

Make ceph ntp parameters specific to wallaby

Browse Source 
This patch makes the ceph _deploy_cmd new ntp parameters added in [1]
only for wallaby.
[1] https://review.opendev.org/c/openstack/tripleo-operator-ansible/+/875051

Change-Id: Ic8f2b979d3888bda2d6ff8abd97fb39a2cfe66cf
This commit is contained in:
katarimanoj 2023-04-26 21:13:53 +05:30
parent 2dfcfff28c
commit e1abb34ef8
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ tripleo_ceph_deploy_daemons:
tripleo_ceph_deploy_single_host_defaults: false tripleo_ceph_deploy_single_host_defaults: false
tripleo_ceph_deploy_ntp_server: tripleo_ceph_deploy_ntp_server:
tripleo_ceph_deploy_ntp_heat_env_file: tripleo_ceph_deploy_ntp_heat_env_file:
tripleo_ceph_deploy_with_ntp: false
tripleo_ceph_deploy_container_cephadm_default: false tripleo_ceph_deploy_container_cephadm_default: false
tripleo_ceph_deploy_container_image_prepare: tripleo_ceph_deploy_container_image_prepare:
tripleo_ceph_deploy_container_namespace: tripleo_ceph_deploy_container_namespace:

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

@ -22,8 +22,10 @@
{{ tripleo_ceph_deploy_skip_container_registry_config | ternary('--skip-container-registry-config', '') }} {{ tripleo_ceph_deploy_skip_container_registry_config | ternary('--skip-container-registry-config', '') }}
{{ tripleo_ceph_deploy_force | ternary('--force', '') }} {{ tripleo_ceph_deploy_force | ternary('--force', '') }}
{{ tripleo_ceph_deploy_single_host_defaults | ternary('--single-host-defaults', '') }} {{ tripleo_ceph_deploy_single_host_defaults | ternary('--single-host-defaults', '') }}
{% if tripleo_ceph_deploy_with_ntp %}
{{ tripleo_ceph_deploy_ntp_server | ternary('--ntp-server $CEPH_NTP_SERVER', '') }} {{ 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_ntp_heat_env_file | ternary('--ntp-heat-env-file $CEPH_NTP_HEAT_ENV_FILE', '') }}
{% endif %}
{{ tripleo_ceph_deploy_network_data | ternary('--network-data $NETWORK_DATA', '') }} {{ 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_public_network_name | ternary('--public-network-name $PUBLIC_NETWORK_NAME', '') }}
{{ tripleo_ceph_deploy_cluster_network_name | ternary('--cluster-network-name $CLUSTER_NETWORK_NAME', '') }} {{ tripleo_ceph_deploy_cluster_network_name | ternary('--cluster-network-name $CLUSTER_NETWORK_NAME', '') }}