Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ bin
docs
hack
inventory/hosts.*
test
utils
**/*.md
*.spec
Expand Down
1 change: 1 addition & 0 deletions images/installer/root/usr/local/bin/entrypoint-provider
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ if ! whoami &>/dev/null; then
fi

# Provide a "files_dir" variable that points to inventory/dynamic/injected
mkdir -p "${WORK}/inventory/dynamic/${TYPE}/group_vars/all"
echo "files_dir: \"${FILES}\"" > "${WORK}/inventory/dynamic/${TYPE}/group_vars/all/00_default_files_dir.yml"
# Add any injected variable files into the group vars directory
find "${FILES}" \( -name '*.yml' -or -name '*.yaml' -or -name vars \) -print0 | xargs -0 -L1 -I {} ln -fs {} "${WORK}/inventory/dynamic/${TYPE}/group_vars/all"
Expand Down
3 changes: 2 additions & 1 deletion inventory/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
hosts
/dynamic/gcp/group_vars/all/00_default_files_dir.yml
/dynamic/gcp/group_vars/all/00_default_files_dir.yml
/dynamic/aws/group_vars/all/00_default_files_dir.yml
Empty file.
19 changes: 6 additions & 13 deletions test/ci/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
This directory contains scripts and other files that are executed by our
CI integration tests.
* Copy `test/ci/vars.yml.sample` to `test/ci/vars.yml`
* Adjust it your liking - this would be the host configuration
* Adjust `inventory/group_vars/OSEv3/vars.yml` - this would be Origin-specific config
* Provision instances via `ansible-playbook -vv -i test/ci/inventory/ test/ci/launch.yml`
This would place inventory file in `test/ci/inventory/hosts` and run prerequisites and deploy.

CI should call a script. The only arguments that each script should accept
are:

1) Path to openshift-ansible/playbooks
2) Inventory path.
3) Extra vars path.

Ideally, inventory path and extra vars should live somewhere in this
subdirectory instead of the CI's source.

Extravars should typically be unnecessary.
* Once the setup is complete run `ansible-playbook -vv -i test/ci/inventory/ test/ci/deprovision.yml`
34 changes: 34 additions & 0 deletions test/ci/deprovision.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
- hosts: localhost
connection: local
gather_facts: false
tasks:
- include_vars: "{{ item }}"
with_first_found:
- vars.yml
- vars.yaml

- name: Gather ec2 facts
ec2_instance_facts:
region: "{{ aws_region }}"
filters:
tag-key: "kubernetes.io/cluster/{{ aws_cluster_id }}"
register: ec2

- name: Stop VMs
ec2:
instance_ids: "{{ item.instance_id }}"
region: "{{ aws_region }}"
state: stopped
wait: no
with_items: "{{ ec2.instances }}"
ignore_errors: true

- name: Rename VMs
ec2_tag:
resource: "{{ item.instance_id }}"
region: "{{ aws_region }}"
tags:
Name: "{{ item.tags.Name }}-terminate"
when: "'-terminate' not in item.tags.Name"
with_items: "{{ ec2.instances }}"
4 changes: 0 additions & 4 deletions test/ci/extra_vars/default.yml

This file was deleted.

33 changes: 0 additions & 33 deletions test/ci/install.sh

This file was deleted.

4 changes: 0 additions & 4 deletions test/ci/inventory/group_vars/OSEv3/checks.yml

This file was deleted.

2 changes: 0 additions & 2 deletions test/ci/inventory/group_vars/OSEv3/general.yml

This file was deleted.

37 changes: 0 additions & 37 deletions test/ci/inventory/group_vars/OSEv3/logging.yml

This file was deleted.

114 changes: 114 additions & 0 deletions test/ci/inventory/group_vars/OSEv3/vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
---
ansible_become: true
ansible_become_sudo: true

openshift_deployment_type: origin
openshift_repos_enable_testing: false

#Minimal set of services
openshift_web_console_install: true
openshift_console_install: true
openshift_metrics_install_metrics: false
openshift_metrics_install_logging: false
openshift_logging_install_logging: false
openshift_management_install_management: false
openshift_hosted_prometheus_deploy: false
template_service_broker_install: false
ansible_service_broker_install: false
openshift_enable_service_catalog: false
osm_use_cockpit: false
openshift_monitoring_deploy: false
openshift_metering_install: false
openshift_metrics_server_install: false
openshift_monitor_availability_install: false
openshift_enable_olm: false
openshift_descheduler_install: false
openshift_node_problem_detector_install: false
openshift_autoheal_deploy: false
openshift_cluster_autoscaler_install: false

# debugging
debug_level: 4
etcd_debug: true
etcd_log_package_levels: 'auth=INFO,etcdmain=DEBUG,etcdserver=DEBUG'
openshift_docker_options: "--log-driver=journald"

#Disable journald persistence
journald_vars_to_replace:
- { var: Storage, val: volatile }
- { var: Compress, val: no }
- { var: SyncIntervalSec, val: 1s }
- { var: RateLimitInterval, val: 1s }
- { var: RateLimitBurst, val: 10000 }
- { var: SystemMaxUse, val: 8G }
- { var: SystemKeepFree, val: 20% }
- { var: SystemMaxFileSize, val: 10M }
- { var: MaxRetentionSec, val: 1month }
- { var: MaxFileSec, val: 1day }
- { var: ForwardToSyslog, val: no }
- { var: ForwardToWall, val: no }

#Other settings
openshift_enable_origin_repo: false
osm_default_node_selector: "node-role.kubernetes.io/compute=true"
openshift_hosted_infra_selector: "node-role.kubernetes.io/infra=true"
openshift_logging_es_nodeselector:
node-role.kubernetes.io/infra: "true"
openshift_logging_es_ops_nodeselector:
node-role.kubernetes.io/infra: "true"
osm_controller_args:
enable-hostpath-provisioner:
- "true"
openshift_hosted_router_create_certificate: true
openshift_master_audit_config:
enabled: true
openshift_master_identity_providers:
- name: "allow_all"
login: "true"
challenge: "true"
kind: "AllowAllPasswordIdentityProvider"
openshift_template_service_broker_namespaces:
- "openshift"
enable_excluders: "true"
osm_cluster_network_cidr: "10.128.0.0/14"
openshift_portal_net: "172.30.0.0/16"
osm_host_subnet_length: 9
openshift_check_min_host_disk_gb: 1.5
openshift_check_min_host_memory_gb: 1.9
openshift_disable_check: package_update,package_availability,memory_availability,disk_availability

openshift_logging_use_mux: false
openshift_logging_use_ops: true
openshift_logging_es_log_appenders:
- "console"
openshift_logging_fluentd_journal_read_from_head: false
openshift_logging_fluentd_audit_container_engine: true

openshift_logging_curator_cpu_request: "100m"
openshift_logging_curator_memory_limit: "32Mi"
openshift_logging_curator_ops_cpu_request: "100m"
openshift_logging_curator_ops_memory_limit: "32Mi"
openshift_logging_elasticsearch_proxy_cpu_request: "100m"
openshift_logging_elasticsearch_proxy_memory_limit: "32Mi"
openshift_logging_es_cpu_request: "400m"
openshift_logging_es_memory_limit: "4Gi"
openshift_logging_es_ops_cpu_request: "400m"
openshift_logging_es_ops_memory_limit: "4Gi"
openshift_logging_eventrouter_cpu_request: "100m"
openshift_logging_eventrouter_memory_limit: "64Mi"
openshift_logging_fluentd_cpu_request: "100m"
openshift_logging_fluentd_memory_limit: "256Mi"
openshift_logging_kibana_cpu_request: "100m"
openshift_logging_kibana_memory_limit: "128Mi"
openshift_logging_kibana_ops_cpu_request: "100m"
openshift_logging_kibana_ops_memory_limit: "128Mi"
openshift_logging_kibana_ops_proxy_cpu_request: "100m"
openshift_logging_kibana_ops_proxy_memory_limit: "64Mi"
openshift_logging_kibana_proxy_cpu_request: "100m"
openshift_logging_kibana_proxy_memory_limit: "64Mi"
openshift_logging_mux_cpu_request: "400m"
openshift_logging_mux_memory_limit: "256Mi"

openshift_master_cluster_method: native

openshift_node_port_range: '30000-32000'
34 changes: 0 additions & 34 deletions test/ci/inventory/group_vars/all.yml

This file was deleted.

4 changes: 0 additions & 4 deletions test/ci/inventory/group_vars/containerized_hosts.yml

This file was deleted.

9 changes: 0 additions & 9 deletions test/ci/inventory/host_vars/localhost.yml

This file was deleted.

23 changes: 0 additions & 23 deletions test/ci/inventory/local.txt

This file was deleted.

30 changes: 0 additions & 30 deletions test/ci/inventory/local_containerized.txt

This file was deleted.

Loading