From b2eb98f203fbdf8bad467ea7b394103ec1f3581d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 31 May 2018 10:18:42 -0700 Subject: [PATCH] Switch scenario00{1,2,3,4,7} to containerized undercloud Change-Id: I99b987b6c3a6ee4d603d89064421199ae1b7d3be --- config/general_config/featureset016.yml | 23 +++++++++++++++++++++++ config/general_config/featureset017.yml | 23 +++++++++++++++++++++++ config/general_config/featureset018.yml | 23 +++++++++++++++++++++++ config/general_config/featureset019.yml | 23 +++++++++++++++++++++++ config/general_config/featureset030.yml | 23 +++++++++++++++++++++++ 5 files changed, 115 insertions(+) diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index ee0f67746..eb7682d0a 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -21,6 +21,29 @@ composable_scenario: scenario001-multinode-containers.yaml validate_template: scenario001-multinode.yaml deployed_server: true +containerized_undercloud: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +undercloud_install_cli_options: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + --use-heat + {%- endif -%} + +undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" +undercloud_cloud_domain: "localdomain" +undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" +undercloud_resource_registry_args: + "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true artcl_create_docs_payload: diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 2dafe43d3..07cc7f031 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -19,6 +19,29 @@ composable_scenario: scenario002-multinode-containers.yaml validate_template: scenario002-multinode.yaml deployed_server: true +containerized_undercloud: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +undercloud_install_cli_options: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + --use-heat + {%- endif -%} + +undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" +undercloud_cloud_domain: "localdomain" +undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" +undercloud_resource_registry_args: + "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true artcl_create_docs_payload: diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index cf9d9dc35..2011ac428 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -19,6 +19,29 @@ composable_scenario: scenario003-multinode-containers.yaml validate_template: scenario003-multinode.yaml deployed_server: true +containerized_undercloud: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +undercloud_install_cli_options: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + --use-heat + {%- endif -%} + +undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" +undercloud_cloud_domain: "localdomain" +undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" +undercloud_resource_registry_args: + "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true artcl_create_docs_payload: diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index ecf9502b0..7c4bd1b1f 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -19,6 +19,29 @@ composable_scenario: scenario004-multinode-containers.yaml validate_template: scenario004-multinode.yaml deployed_server: true +containerized_undercloud: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +undercloud_install_cli_options: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + --use-heat + {%- endif -%} + +undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" +undercloud_cloud_domain: "localdomain" +undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" +undercloud_resource_registry_args: + "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true artcl_create_docs_payload: diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml index b983de7d6..5a969b338 100644 --- a/config/general_config/featureset030.yml +++ b/config/general_config/featureset030.yml @@ -9,6 +9,29 @@ enable_pacemaker: true overcloud_ipv6: false containerized_overcloud: true +containerized_undercloud: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +undercloud_install_cli_options: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + --use-heat + {%- endif -%} + +undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" +undercloud_cloud_domain: "localdomain" +undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" +undercloud_resource_registry_args: + "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + # This enables TLS for the undercloud which will also make haproxy bind to the # configured public-vip and admin-vip. undercloud_generate_service_certificate: false