Don't use NTP server in extra args
We have ntp_args which include ntp_server variable. Don't set it in extra agrs so we can overwrite it. Change-Id: Ib6a30b4581f095b89f0a128232c165c53a716a48
This commit is contained in:
parent
374db36def
commit
43ba8ce92d
|
@ -15,7 +15,6 @@ overcloud_nodes:
|
|||
# Tell tripleo how we want things done.
|
||||
extra_args: >-
|
||||
--compute-scale 1
|
||||
--ntp-server pool.ntp.org
|
||||
|
||||
network_isolation: true
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ step_introspect: false
|
|||
# Tell tripleo about our environment.
|
||||
network_isolation: true
|
||||
network_isolation_type: 'single-nic-vlans'
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
run_tempest: false
|
||||
|
|
|
@ -8,8 +8,7 @@ step_introspect: false
|
|||
# Tell tripleo about our environment.
|
||||
network_isolation: true
|
||||
network_isolation_type: 'single-nic-vlans'
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
|
||||
|
|
|
@ -12,8 +12,7 @@ overcloud_nodes:
|
|||
virtualbmc_port: 6231
|
||||
|
||||
# Tell tripleo how we want things done.
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
# This config is extremely resource intensive, so we disable telemetry
|
||||
# in order to reduce the overall memory footprint
|
||||
|
|
|
@ -75,10 +75,9 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
|
|
|
@ -80,10 +80,9 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
|
|
|
@ -27,8 +27,7 @@ delete_docker_cache: true
|
|||
enable_pacemaker: false
|
||||
network_isolation: false
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
# Tempest
|
||||
run_tempest: true
|
||||
|
|
|
@ -26,8 +26,7 @@ delete_docker_cache: true
|
|||
enable_pacemaker: false
|
||||
network_isolation: false
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
# Tempest
|
||||
run_tempest: true
|
||||
|
|
|
@ -26,8 +26,7 @@ run_tempest: false
|
|||
# Tell tripleo how we want things done.
|
||||
# Note: The order of the templates and arguments passed to heat matters.
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
artcl_gen_docs: true
|
||||
|
|
|
@ -33,7 +33,6 @@ extra_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/puppet-ceph.yaml
|
||||
{% endif %}
|
||||
{% if release not in ['newton', 'ocata'] %}-e {{ overcloud_templates_path }}/ci/environments/ceph-min-osds.yaml{% endif %}
|
||||
--ntp-server pool.ntp.org
|
||||
test_ping: true
|
||||
|
||||
run_tempest: false
|
||||
|
|
|
@ -25,8 +25,7 @@ telemetry_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
|
||||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
test_ping: true
|
||||
|
||||
run_tempest: false
|
||||
|
|
|
@ -13,8 +13,7 @@ undercloud_generate_service_certificate: false
|
|||
# This enables the deployment of the overcloud with SSL.
|
||||
ssl_overcloud: false
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
container_args: >-
|
||||
{% if release in ['pike','queens'] -%}
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
# Tell tripleo how we want things done.
|
||||
# Note: The order of the templates and arguments passed to heat matters.
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
network_isolation: false
|
||||
enable_pacemaker: false
|
||||
|
|
|
@ -27,7 +27,6 @@ telemetry_args: >-
|
|||
# TODO(numans) - Change to neutron-ml2-ovn-ha.yaml once OVS 2.7.2 is available
|
||||
# in rdo.
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
-e {{ overcloud_templates_path }}/environments/neutron-ml2-ovn.yaml
|
||||
|
||||
composable_roles: true
|
||||
|
|
|
@ -48,7 +48,6 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
{% if release == 'pike' -%}
|
||||
-e {{ overcloud_templates_path }}/environments/services-docker/neutron-ovn.yaml
|
||||
{%- else -%}
|
||||
|
|
|
@ -26,7 +26,6 @@ telemetry_args: >-
|
|||
|
||||
extra_args: >-
|
||||
-e {{ overcloud_templates_path }}/environments/services/neutron-opendaylight.yaml
|
||||
--ntp-server pool.ntp.org
|
||||
|
||||
# If `run_tempest` is `true`, run tempests tests, otherwise do not
|
||||
# run them.
|
||||
|
|
|
@ -20,8 +20,7 @@ add_repos:
|
|||
# packages for 3.9 branch
|
||||
pkg_name: centos-release-openshift-origin39
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
container_args: >-
|
||||
{% if release in ['pike','queens'] -%}
|
||||
|
|
|
@ -51,7 +51,6 @@ network_isolation_args: >-
|
|||
-e {{ working_dir }}/network-environment.yaml
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
|
||||
undercloud_enable_routed_networks: >-
|
||||
|
|
|
@ -41,8 +41,7 @@ step_introspect: false
|
|||
# Tell tripleo about our environment.
|
||||
network_isolation: true
|
||||
network_isolation_type: 'multiple-nics'
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
test_ping: true
|
||||
enable_pacemaker: true
|
||||
run_tempest: false
|
||||
|
|
|
@ -28,7 +28,6 @@ telemetry_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/ipsec.yaml
|
||||
|
||||
|
|
|
@ -26,8 +26,7 @@ delete_docker_cache: true
|
|||
enable_pacemaker: false
|
||||
network_isolation: false
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
extra_args: ''
|
||||
|
||||
# Tempest
|
||||
run_tempest: true
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
undercloud_generate_service_certificate: false
|
||||
step_introspect: false
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
- {{ overcloud_templates_path }}/environments/ceph-ansible/ceph-ansible.yaml
|
||||
- {{ overcloud_templates_path }}/environments/ceph-ansible/ceph-mds.yaml
|
||||
- {{ overcloud_templates_path }}/environments/ceph-ansible/ceph-rgw.yaml
|
||||
|
|
|
@ -68,10 +68,9 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
|
|
|
@ -35,10 +35,9 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
--ntp-server pool.ntp.org
|
||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
# options below direct automatic doc generation by tripleo-collect-logs
|
||||
|
|
Loading…
Reference in New Issue