Skip to content

Commit c4dc517

Browse files
authored
Merge pull request #62 from learnlinux/devel
add etcd user for tuxlab-session-daemon
2 parents d18b432 + 14ea988 commit c4dc517

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

roles/etcd-auth/tasks/main.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@
2727
- { user: 'dns', pass: '{{ dns_pass }}' }
2828
- { user: 'proxy', pass: '{{ proxy_pass }}' }
2929
- { user: 'meteor', pass: '{{ meteor_pass }}' }
30+
- { user: 'session', pass: '{{ session_pass }}' }
3031

3132
- name: Add etcd roles
3233
shell: |
3334
etcdctl -u root:{{ root_pass }} role add skydns;
3435
etcdctl -u root:{{ root_pass }} role add redrouter;
3536
etcdctl -u root:{{ root_pass }} role add tuxlab;
37+
etcdctl -u root:{{ root_pass }} role add session;
3638
3739
- name: Grant role permissions
3840
shell: |
@@ -50,6 +52,7 @@
5052
etcdctl -u root:{{ root_pass }} user grant meteor -roles skydns;
5153
etcdctl -u root:{{ root_pass }} user grant meteor -roles redrouter;
5254
etcdctl -u root:{{ root_pass }} user grant meteor -roles tuxlab;
55+
etcdctl -u root:{{ root_pass }} user grant session -roles tuxlab;
5356
5457
- name: Ensure dns user configured properly
5558
expect:
@@ -80,3 +83,13 @@
8083
until: "'Password updated' in '{{ pass_success_meteor.stdout }}'"
8184
retries: 5
8285
delay: 1
86+
87+
- name: Ensure session user configured properly
88+
expect:
89+
command: etcdctl -u root:{{ root_pass }} user passwd session
90+
responses:
91+
"New password:": "{{ session_pass }}"
92+
register: pass_success_session
93+
until: "'Password updated' in '{{ pass_success_session.stdout }}'"
94+
retries: 5
95+
delay: 1

roles/etcd-cluster/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
- 'meteor_pass_file'
3838
- 'dns_pass_file'
3939
- 'proxy_pass_file'
40+
- 'session_pass_file'
4041

4142
- name: Generate pass files
4243
run_once: true
@@ -48,6 +49,7 @@
4849
- { file: 'file_info.results[1]', val: 'meteor_pass' }
4950
- { file: 'file_info.results[2]', val: 'dns_pass' }
5051
- { file: 'file_info.results[3]', val: 'proxy_pass' }
52+
- { file: 'file_info.results[4]', val: 'session_pass' }
5153

5254
- name: Load pass files
5355
set_fact:
@@ -58,6 +60,7 @@
5860
- { file: 'file_info.results[1]', val: 'meteor_pass', name: 'meteor_pass_file' }
5961
- { file: 'file_info.results[2]', val: 'dns_pass', name: 'dns_pass_file' }
6062
- { file: 'file_info.results[3]', val: 'proxy_pass', name: 'proxy_pass_file' }
63+
- { file: 'file_info.results[4]', val: 'session_pass', name: 'session_pass_file' }
6164

6265
- name: Copy pass files
6366
run_once: true
@@ -67,3 +70,4 @@
6770
- { file: 'file_info.results[1]', val: "{{ meteor_pass }}", name: 'meteor_pass_file' }
6871
- { file: 'file_info.results[2]', val: "{{ dns_pass }}", name: 'dns_pass_file' }
6972
- { file: 'file_info.results[3]', val: "{{ proxy_pass }}", name: 'proxy_pass_file' }
73+
- { file: 'file_info.results[4]', val: "{{ session_pass }}", name: 'session_pass_file' }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"etcd_host_ip": "{{ ansible_host }}",
33
"etcd_host_port": "2379",
4-
"etcd_username": "proxy",
5-
"etcd_pass": "{{ proxy_pass }}"
4+
"etcd_username": "session",
5+
"etcd_pass": "{{ session_pass }}"
66
}

0 commit comments

Comments
 (0)