diff options
Diffstat (limited to 'ci/config_tpl/bundle_tpl/phase2-overrides.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/phase2-overrides.yaml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml index 2063607f..12b8905a 100644 --- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml +++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml @@ -6,22 +6,21 @@ {% endif %} {% if os.ha.mode == 'ha' %} {% if os.api.haproxy_timeout %} - haproxy-server-timeout: {{ os.api.haproxy_timeout }} - haproxy-client-timeout: {{ os.api.haproxy_timeout }} - haproxy-queue-timeout: {{ os.api.haproxy_timeout }} - haproxy-connect-timeout: {{ os.api.haproxy_timeout }} + #haproxy-server-timeout: {{ os.api.haproxy_timeout }} + #haproxy-client-timeout: {{ os.api.haproxy_timeout }} + #haproxy-queue-timeout: {{ os.api.haproxy_timeout }} + #haproxy-connect-timeout: {{ os.api.haproxy_timeout }} {% endif %} {% endif %} {% if os.api.worker_multiplier %} - worker-multiplier: {{ os.api.worker_multiplier }} + #worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} {% if os.network.dvr %} - enable-dvr: true + #enable-dvr: true {% endif %} {% if os.network.l2_population %} - l2-population: true + #l2-population: true {% endif %} - region: {{ os.region }} {% if ubuntu.release == 'trusty' %} #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% endif %} @@ -30,10 +29,9 @@ #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% endif %} {% endif %} - #openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% if os.ha.mode == 'nonha' %} {% if opnfv.storage_dict.ceph is defined %} - ceph-osd-replication-count: {{ unit_ceph_qty() }} + #ceph-osd-replication-count: {{ unit_ceph_qty() }} {% endif %} {% endif %} admin-role: {{ os.admin.role }} |