diff --git a/roles/common/vars/main.yaml b/roles/common/vars/main.yaml index bc1b02999..bd0a78cd7 100644 --- a/roles/common/vars/main.yaml +++ b/roles/common/vars/main.yaml @@ -36,6 +36,8 @@ rhcloud: >- rdocloud {%- elif 'vexxhost-nodepool-tripleo' in nodepool_provider -%} vexxhost + {%- elif 'psi-public-nodepool-tripleo' in nodepool_provider -%} + psi {%- elif nodepool_provider == 'tripleo-ci' and environment_type == 'ovb' -%} internal {%- endif -%} diff --git a/toci-quickstart/config/testenv/multinode-psi.yml b/toci-quickstart/config/testenv/multinode-psi.yml new file mode 100644 index 000000000..4d5fefaaa --- /dev/null +++ b/toci-quickstart/config/testenv/multinode-psi.yml @@ -0,0 +1,86 @@ +--- +# TRIPLEO-CI environment settings +cloudenv: "psi" +undercloud_user: "{{ lookup('env','USER') }}" +non_root_user: "{{ undercloud_user }}" +extra_args: > + -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml + -e /usr/share/openstack-tripleo-heat-templates/environments/debug.yaml + --overcloud-ssh-user {{ undercloud_user }} +# ara install and config +undercloud_ansible_cfg: false + +toci_vxlan_networking: true +toci_vxlan_networking_multinode: true +vxlan_mtu: 1350 +hostname_correction: true # workaround restriction on toci images + +mtu: "{{ vxlan_mtu }}" +undercloud_local_mtu: "{{ mtu }}" +minion_local_mtu: "{{ mtu }}" +overcloud_neutron_global_physnet_mtu: "{{ mtu }}" + +ceph_use_fqdn: true + +# environment settings, not TRIPLEO-CI specific +undercloud_local_interface: "br-ex" # related to osinfra network configuration +minion_local_interface: "br-ex" # related to osinfra network configuration +flavor_args: "" +undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template" +generate_pingtest_subunit: true +# Images settings +image_cache_dir_cleanup: true +# user home (working_dir default) is the base dir for all images operations +# if it's changed, nothing will work +build_image_isolated: false +build_undercloud: false + +# Rely on RDO registry instead of docker.io due to rate limit +# job.build_container_images is defined in zuul as a +# direct var. adding build_container_images as tqe +# var so that we can turn this on/off per release w/o +# changing zuul and breaking jobs via inheritance. +docker_registry_host: >- + {% if job is defined and + job.build_container_images is defined and + job.build_container_images|default(false)|bool or + build_container_images|default(false)|bool -%} + 127.0.0.1:5001 + {%- elif job.consumer_job | default(false) | bool -%} + {{ job.registry_ip_address_branch[release] }}:5001 + {%- else -%} + trunk.registry.rdoproject.org + {%- endif -%} + +# We don't need to cleanup TripleO CI +tempest_track_resources: false + +# Use cirros cached image +tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img +tempest_tempest_conf_overrides: + image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img + +# Container update settings +update_containers: >- + {% if containerized_overcloud|bool or containerized_undercloud|bool -%} + true + {%- endif -%} + +# Tempestmail settings +tempestmail_log_server: http://logs.rdoproject.org + +#build-test packages +artg_repos_dir: "{{ tripleo_root }}" + +# disable disk cleaning before starting installation +undercloud_clean_nodes: false +# InfluxDB module settings +influxdb_only_successful_tasks: true +influxdb_measurement: job +influxdb_url: https://influxdb.review.rdoproject.org +influxdb_port: 8086 +influxdb_user: tripleo_ci +influxdb_password: +influxdb_dbname: tripleo_ci +influxdb_data_file_path: "{{ artcl_collect_dir }}/influxdb_data" +influxdb_create_data_file: true diff --git a/toci-quickstart/config/testenv/ovb-psi.yml b/toci-quickstart/config/testenv/ovb-psi.yml new file mode 100644 index 000000000..60046bf2c --- /dev/null +++ b/toci-quickstart/config/testenv/ovb-psi.yml @@ -0,0 +1,77 @@ +# This file contains settings that are specific to Psi +# These settings will override the ovb default settings + +# These values are defined now in the te-broker config +# https://github.com/openstack-infra/tripleo-ci/blob/master/scripts/te-broker/create-env#L47 +cloudenv: "psi" +custom_nameserver: + - 1.1.1.1 + - 1.0.0.1 +external_net: 'public' +ntp_server: '0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org' +workers_args: >- + -e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml + -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml + -e {{ overcloud_templates_path }}/environments/debug.yaml +# Use cirros cached image +tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img +tempest_tempest_conf_overrides: + image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img + +# Container update settings +update_containers: >- + {% if containerized_overcloud|bool or containerized_undercloud|bool -%} + true + {%- endif -%} + +# Rely on RDO registry instead of docker.io due to rate limit +# job.build_container_images is defined in zuul as a +# direct var. adding build_container_images as tqe +# var so that we can turn this on/off per release w/o +# changing zuul and breaking jobs via inheritance. +docker_registry_host: >- + {% if job is defined and + job.build_container_images is defined and + job.build_container_images|default(false)|bool or + build_container_images|default(false)|bool -%} + 127.0.0.1:5001 + {%- elif job.consumer_job | default(false) | bool -%} + {{ job.registry_ip_address_branch[release] }}:5001 + {%- else -%} + trunk.registry.rdoproject.org + {%- endif -%} + +# We don't need to cleanup TripleO CI +tempest_track_resources: false + +# Tempestmail settings +tempestmail_log_server: http://logs.rdoproject.org + +#build-test packages +artg_repos_dir: "{{ tripleo_root }}" + +# disable disk cleaning before starting installation +undercloud_clean_nodes: false + +# InfluxDB module settings +influxdb_only_successful_tasks: true +influxdb_measurement: job +influxdb_url: https://influxdb.review.rdoproject.org +influxdb_port: 8086 +influxdb_user: tripleo_ci +influxdb_password: +influxdb_dbname: tripleo_ci +influxdb_data_file_path: "{{ artcl_collect_dir }}/influxdb_data" +influxdb_create_data_file: true + +# Browbeat settings +cloud_name: psi +elastic_host: browbeat.test.com +grafana_host: browbeat.test.com + +# Ironic debug +# https://bugs.launchpad.net/tripleo/+bug/1797526 +step_introspect_debug: true + +# Ensure logs are gzipped +artcl_gzip: true diff --git a/toci-quickstart/config/testenv/singlenode-psi.yml b/toci-quickstart/config/testenv/singlenode-psi.yml new file mode 120000 index 000000000..1c9750508 --- /dev/null +++ b/toci-quickstart/config/testenv/singlenode-psi.yml @@ -0,0 +1 @@ +multinode-psi.yml \ No newline at end of file