Commit 70d98e75 authored by Eric Pellegrini's avatar Eric Pellegrini

refactored jupyterhub var file

parent bf4b7859
......@@ -4,12 +4,13 @@
#############################################
os_admin_auth:
auth_url: http://cloudsrv1.ill.fr:5000/v3
username: admin
password: "{{ vault_os_admin_password }}"
project_name: admin
project_domain_name: default
user_domain_name: default
auth_url: http://cloudsrv1.ill.fr:5000/v3
username: admin
password: "{{ vault_os_admin_password }}"
project_name: admin
project_domain_name: default
user_domain_name: default
project_id: 86d30d14111b434da7e94931179079e3
os_domains:
- name: jhub-domain
......@@ -29,8 +30,13 @@ os_users:
- name: jhub-user
auth: "{{ os_admin_auth }}"
auth_type: password
password: "{{ vault_os_jhub_user_password }}"
domain: "{{ os_domains[0]['name'] }}"
user_auth:
auth_url: http://cloudsrv1.ill.fr:5000/v3
username: jhub-user
password: "{{ vault_os_jhub_user_password }}"
project_name: "{{ os_projects[0]['name'] }}"
project_domain_name: "{{ os_projects[0]['domain'] }}"
user_domain_name: "{{ os_domains[0]['name'] }}"
roles:
- user: jhub-user
......@@ -39,17 +45,9 @@ os_users:
project: "{{ os_projects[0]['name'] }}"
role: admin
os_user_auth:
auth_url: http://cloudsrv1.ill.fr:5000/v3
username: "{{ os_users['users'][0]['name'] }}"
password: "{{ os_users['users'][0]['password'] }}"
project_name: "{{ os_projects[0]['name'] }}"
project_domain_name: "{{ os_projects[0]['domain'] }}"
user_domain_name: "{{ os_users['users'][0]['domain'] }}"
os_flavors:
- name: jhub-small
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
ram: 4096
vcpus: 2
......@@ -78,27 +76,17 @@ os_networks:
- 195.83.126.2
- 195.83.126.11
#routers:
#- name: jhub-router
# auth: "{{ os_user_auth }}"
# auth_type: password
# project: "{{ os_projects[0]['name'] }}"
# network: provider
# interfaces:
# - net: jhub-network
# subnet: jhub-subnet
security_groups:
- name: jhub-secgroup
auth: "{{ os_user_auth }}"
auth_type: password
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group_rules:
- direction: ingress
remote_ip_prefix: 0.0.0.0/0
ethertype: IPv4
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -106,7 +94,7 @@ os_networks:
- direction: egress
remote_ip_prefix: 0.0.0.0/0
ethertype: IPv4
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -114,7 +102,7 @@ os_networks:
- protocol: icmp
remote_ip_prefix: 0.0.0.0/0
ethertype: IPv4
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -124,7 +112,7 @@ os_networks:
ethertype: IPv4
port_range_min: 22
port_range_max: 22
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -134,7 +122,7 @@ os_networks:
ethertype: IPv4
port_range_min: 80
port_range_max: 80
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -144,7 +132,7 @@ os_networks:
ethertype: IPv4
port_range_min: 8000
port_range_max: 8000
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -154,7 +142,7 @@ os_networks:
ethertype: IPv4
port_range_min: 8001
port_range_max: 8001
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -164,7 +152,7 @@ os_networks:
ethertype: IPv4
port_range_min: 8080
port_range_max: 8080
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -174,7 +162,7 @@ os_networks:
ethertype: IPv4
port_range_min: 443
port_range_max: 443
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
......@@ -182,32 +170,34 @@ os_networks:
- protocol: udp
ethertype: IPv4
remote_ip_prefix: 0.0.0.0/0
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
project: "{{ os_projects[0]['name'] }}"
security_group: jhub-secgroup
os_keypairs:
- name: intra-cluster
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
size: 2048
type: rsa
identity_file: "~/.ssh/openstack/intra-cluster"
create: True
- name: extra-cluster
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
size: 2048
type: rsa
identity_file: "~/.ssh/openstack/extra-cluster"
create: True
os_vms_commons:
keypair: "{{ os_keypairs[1]['name'] }}"
network: "{{ os_networks['networks'][0]['name'] }}"
availability_zone: nova
security_groups: "{{ os_networks['security_groups'] | map(attribute='name') | list }}"
auth: "{{ os_user_auth }}"
auth: "{{ os_users['users'][0]['user_auth'] }}"
auth_type: password
flavor: "{{ os_flavors[0]['name'] }}"
image: ubuntu-bionic
......@@ -239,11 +229,10 @@ os_vms:
#############################################
ansible_controller:
identity_files:
- private: "{{ os_keypairs[1]['identity_file'] }}"
host:
- 192.168.13.*
- 192.168.13.*
#############################################
# users
......@@ -252,20 +241,20 @@ ansible_controller:
cluster_users_commons:
passwordless_sudo: True
identity_files:
- identity_file: "{{ os_keypairs[0]['identity_file'] }}"
- identity_file: "{{ os_keypairs[0]['identity_file'] }}"
add_private: True
add_public: True
host:
- 192.168.13.*
- 192.168.13.*
- identity_file: "{{ os_keypairs[1]['identity_file'] }}"
add_private: False
add_public: True
cluster_users:
vm_admin:
name: ubuntu
group: ubuntu
new: False
jupyterhub_admin:
......@@ -294,7 +283,6 @@ ntp:
#############################################
mysql:
localhost: False
bind_server: jhub-haproxy
......@@ -308,26 +296,29 @@ mysql:
priv: "jupyterhub_db.*:ALL"
host: "192.168.13.%"
#############################################
# haproxy
#############################################
#############################################
# load_balancer
#############################################
load_balancer:
proxy_server: haproxy_server
proxy_server: jhub-haproxy
pem_file: /etc/ssl/certs/star.ill.fr.pem
#############################################
# ssd
#############################################
sssd:
local_homes:
- user: "{{ cluster_users.vm_admin.name }}"
home: "/localhome/{{ cluster_users.vm_admin.name }}"
#############################################
# jupyterhub
#############################################
jupyterhub:
cookie_secret: "{{ vault_cookie_secret }}"
proxy_authentication_token: "{{ vault_proxy_authentication_token }}"
......@@ -355,4 +346,3 @@ jupyterhub:
database: "{{ mysql['databases'][0] }}"
user: "{{ mysql['users'][0]['name'] }}"
password: "{{ mysql['users'][0]['password'] }}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment