diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-07 00:03:20 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-07 08:18:23 -0500 |
| commit | 18edc25759537951d6c5cdc3575c3d1b5c0d9fbc (patch) | |
| tree | 2bc22dd634ce127c8ac9b7094458e8c0598d7a1c /ci/config_tpl/bundle_tpl/phase2-overrides.yaml | |
| parent | 44db065d7944b02b6948fbda4e504d6e9df0f640 (diff) | |
fetch the correct ceilometer.
Change-Id: I68bd8c58cd9424886086275664dc70110270252a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
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 }} |