openstack/tripleo-quickstart
Code Issues Proposed changes

Merge "Use network templates from tripleo-heat-templates"

Browse Source
This commit is contained in:
Zuul 2018-01-16 15:54:14 +00:00 committed by Gerrit Code Review
commit 85229566c3
6 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/general_config/featureset001.yml
View File

@ -23,9 +23,14 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
{%- else -%}
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{%- endif -%}
# This featureset is extremely resource intensive, so we disable telemetry
# in order to reduce the overall memory footprint

11
config/general_config/featureset002.yml
View File

@ -28,9 +28,14 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
{%- else -%}
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{%- endif -%}
extra_args: >-
--ntp-server pool.ntp.org

11
config/general_config/featureset021.yml
View File

@ -14,9 +14,14 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
{%- else -%}
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{%- endif -%}
extra_args: >-
--ntp-server pool.ntp.org

5
config/general_config/featureset024.yml
View File

@ -15,9 +15,14 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
{% else %}
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/ipv6-network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{% endif %}
# This featureset is extremely resource intensive, so we disable telemetry
# in order to reduce the overall memory footprint

11
config/general_config/featureset025.yml
View File

@ -14,9 +14,14 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
{%- else -%}
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
{%- endif -%}
# This featureset is extremely resource intensive, so we disable telemetry
# in order to reduce the overall memory footprint

6
config/general_config/featureset035.yml
View File

@ -17,10 +17,16 @@ enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics-ipv6/network-environment.yaml
-e {{ working_dir }}/network-environment.yaml
{% else %}
-e {{ overcloud_templates_path }}/environments/network-isolation-v6.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/ipv6-network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
-e {{ working_dir }}/network-environment.yaml
{% endif %}
extra_args: >-
--ntp-server pool.ntp.org