From 7df1c9d24534fa682eddcc728cadcc8edc3c30a8 Mon Sep 17 00:00:00 2001 From: Nicolas MASSE Date: Wed, 3 Feb 2021 14:02:22 +0100 Subject: [PATCH] final changes --- inventory.sample | 2 +- provision.yaml | 10 ++++------ scenarios/baseline.yaml | 8 ++++++++ scenarios/ldap.yaml | 10 +++++++++- scenarios/mariadb.yaml | 8 ++++++++ scenarios/one-node.yaml | 9 +++++++++ 6 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 scenarios/one-node.yaml diff --git a/inventory.sample b/inventory.sample index 9a39ce4..0a3a644 100644 --- a/inventory.sample +++ b/inventory.sample @@ -1,2 +1,2 @@ [sut] -hp-microserver.itix.fr ansible_become=yes ansible_user=nicolas +my-server.example ansible_become=yes ansible_user=john diff --git a/provision.yaml b/provision.yaml index 46485b2..27e7d4d 100644 --- a/provision.yaml +++ b/provision.yaml @@ -6,6 +6,8 @@ - enable_ldap is defined - enable_https is defined - database is defined + - keycloak_env is defined + - keycloak_instances is defined msg: >- specify the scenario to provision as extra vars (using -e '@scenarios/foo.yaml') @@ -215,14 +217,10 @@ image: '{{ keycloak_image }}' state: started cpuset_cpus: '{{ item.cpuset }}' - env: '{{ common_env | combine(db_env) }}' + env: '{{ common_env | combine(db_env) | combine(keycloak_env) }}' volume: - '/etc/keycloak:/etc/keycloak:z' - loop: - - name: keycloak-server-1 - cpuset: 1,5 - - name: keycloak-server-2 - cpuset: 2,6 + loop: '{{ keycloak_instances }}' vars: db_env: '{{ postgres_env if database == "postgresql" else mariadb_env }}' mariadb_env: diff --git a/scenarios/baseline.yaml b/scenarios/baseline.yaml index b8582ca..1f483b8 100644 --- a/scenarios/baseline.yaml +++ b/scenarios/baseline.yaml @@ -1,3 +1,11 @@ enable_https: no enable_ldap: no database: postgresql +keycloak_instances: +- name: keycloak-server-1 + cpuset: 1,5 +- name: keycloak-server-2 + cpuset: 2,6 +keycloak_env: + CACHE_OWNERS_COUNT: '2' + CACHE_OWNERS_AUTH_SESSIONS_COUNT: '2' diff --git a/scenarios/ldap.yaml b/scenarios/ldap.yaml index fd49387..7bf6cfe 100644 --- a/scenarios/ldap.yaml +++ b/scenarios/ldap.yaml @@ -1,4 +1,12 @@ enable_https: no enable_ldap: yes database: postgresql -openldap_users_count: 1000000 +openldap_users_count: 100000 +keycloak_instances: +- name: keycloak-server-1 + cpuset: 1,5 +- name: keycloak-server-2 + cpuset: 2,6 +keycloak_env: + CACHE_OWNERS_COUNT: '2' + CACHE_OWNERS_AUTH_SESSIONS_COUNT: '2' diff --git a/scenarios/mariadb.yaml b/scenarios/mariadb.yaml index ef20f24..6f19dee 100644 --- a/scenarios/mariadb.yaml +++ b/scenarios/mariadb.yaml @@ -1,3 +1,11 @@ enable_https: no enable_ldap: no database: mariadb +keycloak_instances: +- name: keycloak-server-1 + cpuset: 1,5 +- name: keycloak-server-2 + cpuset: 2,6 +keycloak_env: + CACHE_OWNERS_COUNT: '2' + CACHE_OWNERS_AUTH_SESSIONS_COUNT: '2' diff --git a/scenarios/one-node.yaml b/scenarios/one-node.yaml new file mode 100644 index 0000000..3fec745 --- /dev/null +++ b/scenarios/one-node.yaml @@ -0,0 +1,9 @@ +enable_https: no +enable_ldap: no +database: postgresql +keycloak_instances: +- name: keycloak-server + cpuset: 1,5,2,6 +keycloak_env: + CACHE_OWNERS_COUNT: '1' + CACHE_OWNERS_AUTH_SESSIONS_COUNT: '1'