Merge "Add elasticsearch container and nginx proxy"
diff --git a/openssh/server/team/members/pshchelo.yaml b/openssh/server/team/members/pshchelo.yaml
new file mode 100644
index 0000000..52e7cc6
--- /dev/null
+++ b/openssh/server/team/members/pshchelo.yaml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ pshchelo:
+ enabled: true
+ name: pshchelo
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Pavlo Shchelokovskyy
+ home: /home/pshchelo
+ email: pshchelokovskyy@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ pshchelo:
+ enabled: true
+ public_keys:
+ - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOns6c3H+TP0HBYWI+N6nX/ilPrGth5ElLCyN4EHJqcq pshchelo@git
+ user: ${linux:system:user:pshchelo}
diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index 453c450..e6e0ae0 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,7 +27,5 @@
days_valid:
authority: ${_param:octavia_ca_days_valid_authority}
certificate: ${_param:octavia_ca_days_valid_certificate}
- ca_file: ${octavia:manager:certificates:ca_certificate}
- ca_key_file: ${octavia:manager:certificates:ca_private_key}
user: octavia
group: octavia