Merge "Set --ntp-server without having to edit extra_args"

config/general_config/ovb-ha-multiple-nics.yml

@@ -78,8 +78,7 @@ images:
 
 # overcloud deployment settings
 validation_args: " "
-extra_args: " --control-flavor baremetal --compute-flavor baremetal --control-scale 3  \
---ntp-server {{ ntp_server }} "
+extra_args: " --control-flavor baremetal --compute-flavor baremetal --control-scale 3 "
 
 # This featureset is extremely resource intensive, so we disable telemetry
 # in order to reduce the overall memory footprint

config/general_config/ovb-minimal-pacemaker-public-bond.yml

@@ -79,8 +79,7 @@ images:
 
 # overcloud deployment settings
 validation_args: " "
-extra_args: " --control-flavor baremetal --compute-flavor baremetal \
- --ntp-server {{ ntp_server }} "
+extra_args: " --control-flavor baremetal --compute-flavor baremetal "
 
 # This featureset is extremely resource intensive, so we disable telemetry
 # in order to reduce the overall memory footprint

roles/overcloud-deploy/defaults/main.yml

@@ -74,6 +74,7 @@ set_overcloud_workers: true
 cloud_name_args: ""
 network_args: ""
 network_isolation_args: ""
+ntp_args: ""
 pacemaker_args: ""
 workers_args: ""
 backup_args: ""
@@ -105,6 +106,7 @@ deploy_args: >-
   {{ libvirt_args }}
   {{ flavor_args }}
   {{ timeout_args }}
+  {{ ntp_args }}
   {{ cloud_name_args }}
   {{ multinode_args }}
   {{ pacemaker_args }}

roles/overcloud-deploy/tasks/pre-deploy.yml

@@ -82,6 +82,13 @@
     - network_isolation|bool
     - containerized_overcloud|bool
 
+- name: set ntp_args
+  set_fact:
+    ntp_args: >-
+      --ntp-server {{ ntp_server }}
+  when:
+    - ntp_server|default('')
+
 - name: enable pacemaker
   set_fact:
     pacemaker_args: >-