From 02408e20bf979d399c86d236f690476e0bc1533b Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Tue, 21 Nov 2023 10:09:41 +0000 Subject: [PATCH] Replacing edpm_chrony_ntp_servers with timesync_ntp_servers ref: https://github.com/openstack-k8s-operators/dataplane-operator/pull/463 Depends-On: https://review.rdoproject.org/r/c/rdo-jobs/+/50837 Signed-off-by: Fabricio Aguiar --- docs/contributing/tests.md | 2 +- docs/openstack/edpm_adoption.md | 6 +++--- tests/roles/dataplane_adoption/defaults/main.yaml | 4 ++-- tests/roles/dataplane_adoption/tasks/main.yaml | 2 +- tests/vars.sample.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/contributing/tests.md b/docs/contributing/tests.md index 5c1cb41ff..8b34a5e59 100644 --- a/docs/contributing/tests.md +++ b/docs/contributing/tests.md @@ -37,7 +37,7 @@ test suite: * `edpm_privatekey_path` - * `edpm_chrony_ntp_servers` + * `timesync_ntp_servers` ## Running the tests diff --git a/docs/openstack/edpm_adoption.md b/docs/openstack/edpm_adoption.md index 4b0202eda..435ef328f 100644 --- a/docs/openstack/edpm_adoption.md +++ b/docs/openstack/edpm_adoption.md @@ -254,9 +254,9 @@ EOF edpm_nodes_validation_validate_controllers_icmp: false edpm_nodes_validation_validate_gateway_icmp: false - edpm_chrony_ntp_servers: - - clock.redhat.com - - clock2.redhat.com + timesync_ntp_servers: + - hostname: clock.redhat.com + - hostname: clock2.redhat.com edpm_ovn_controller_agent_image: quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified edpm_iscsid_image: quay.io/podified-antelope-centos9/openstack-iscsid:current-podified diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml index 689edd181..616838c48 100644 --- a/tests/roles/dataplane_adoption/defaults/main.yaml +++ b/tests/roles/dataplane_adoption/defaults/main.yaml @@ -2,5 +2,5 @@ registry_name: "quay.io" registry_namespace: "podified-antelope-centos9" image_tag: "current-podified" ansible_ssh_private_key_secret: dataplane-adoption-secret -default_edpm_chrony_ntp_servers: - - pool.ntp.org +default_timesync_ntp_servers: + - hostname: pool.ntp.org diff --git a/tests/roles/dataplane_adoption/tasks/main.yaml b/tests/roles/dataplane_adoption/tasks/main.yaml index 30fe02ae5..d3a282882 100644 --- a/tests/roles/dataplane_adoption/tasks/main.yaml +++ b/tests/roles/dataplane_adoption/tasks/main.yaml @@ -267,7 +267,7 @@ edpm_nodes_validation_validate_controllers_icmp: false edpm_nodes_validation_validate_gateway_icmp: false - edpm_chrony_ntp_servers: {{ edpm_chrony_ntp_servers | default(default_edpm_chrony_ntp_servers) }} + timesync_ntp_servers: {{ timesync_ntp_servers | default(default_timesync_ntp_servers) }} edpm_ovn_controller_agent_image: "{{ registry_name }}/{{ registry_namespace }}/openstack-ovn-controller:{{ image_tag }}" edpm_iscsid_image: "{{ registry_name }}/{{ registry_namespace }}/openstack-iscsid:{{ image_tag }}" diff --git a/tests/vars.sample.yaml b/tests/vars.sample.yaml index d29ec938a..411a9a8af 100644 --- a/tests/vars.sample.yaml +++ b/tests/vars.sample.yaml @@ -17,9 +17,9 @@ source_ovndb_ip: 192.168.122.100 #CUSTOMIZE_THIS edpm_node_ip: 192.168.122.100 #CUSTOMIZE_THIS # NTP servers list -edpm_chrony_ntp_servers: +timesync_ntp_servers: # - clock.redhat.com # Will not work outside of RH intranet - - pool.ntp.org + - hostname: pool.ntp.org # Auth URL to use for adopted Keystone. auth_url: http://keystone-public-openstack.apps-crc.testing