Merge pull request #62 from learnlinux/devel

add etcd user for tuxlab-session-daemon

Author: amortenson

roles/etcd-auth/tasks/main.yml

@@ -27,12 +27,14 @@
     - { user: 'dns', pass: '{{ dns_pass }}' }
     - { user: 'proxy', pass: '{{ proxy_pass }}' }
     - { user: 'meteor', pass: '{{ meteor_pass }}' }
+    - { user: 'session', pass: '{{ session_pass }}' }
 
 - name: Add etcd roles
   shell: |
     etcdctl -u root:{{ root_pass }} role add skydns;
     etcdctl -u root:{{ root_pass }} role add redrouter;
     etcdctl -u root:{{ root_pass }} role add tuxlab;
+    etcdctl -u root:{{ root_pass }} role add session;
 
 - name: Grant role permissions
   shell: |
@@ -50,6 +52,7 @@
     etcdctl -u root:{{ root_pass }} user grant meteor -roles skydns;
     etcdctl -u root:{{ root_pass }} user grant meteor -roles redrouter;
     etcdctl -u root:{{ root_pass }} user grant meteor -roles tuxlab;
+    etcdctl -u root:{{ root_pass }} user grant session -roles tuxlab;
 
 - name: Ensure dns user configured properly
   expect:
@@ -80,3 +83,13 @@
   until: "'Password updated' in '{{ pass_success_meteor.stdout }}'"
   retries: 5
   delay: 1
+
+- name: Ensure session user configured properly
+  expect:
+    command: etcdctl -u root:{{ root_pass }} user passwd session
+    responses:
+      "New password:": "{{ session_pass }}"
+  register: pass_success_session
+  until: "'Password updated' in '{{ pass_success_session.stdout }}'"
+  retries: 5
+  delay: 1

roles/etcd-cluster/tasks/main.yml

@@ -37,6 +37,7 @@
      - 'meteor_pass_file'
      - 'dns_pass_file'
      - 'proxy_pass_file'
+     - 'session_pass_file'
 
  - name: Generate pass files
    run_once: true
@@ -48,6 +49,7 @@
      - { file: 'file_info.results[1]', val: 'meteor_pass' }
      - { file: 'file_info.results[2]', val: 'dns_pass' }
      - { file: 'file_info.results[3]', val: 'proxy_pass' }
+     - { file: 'file_info.results[4]', val: 'session_pass' }
 
  - name: Load pass files
    set_fact:
@@ -58,6 +60,7 @@
      - { file: 'file_info.results[1]', val: 'meteor_pass', name: 'meteor_pass_file' }
      - { file: 'file_info.results[2]', val: 'dns_pass', name: 'dns_pass_file' }
      - { file: 'file_info.results[3]', val: 'proxy_pass', name: 'proxy_pass_file' }
+     - { file: 'file_info.results[4]', val: 'session_pass', name: 'session_pass_file' }
 
  - name: Copy pass files
    run_once: true
@@ -67,3 +70,4 @@
      - { file: 'file_info.results[1]', val: "{{ meteor_pass }}", name: 'meteor_pass_file' }
      - { file: 'file_info.results[2]', val: "{{ dns_pass }}", name: 'dns_pass_file' }
      - { file: 'file_info.results[3]', val: "{{ proxy_pass }}", name: 'proxy_pass_file' }
+     - { file: 'file_info.results[4]', val: "{{ session_pass }}", name: 'session_pass_file' }

roles/tuxlab-session-daemon/templates/settings.json

@@ -1,6 +1,6 @@
 {
   "etcd_host_ip": "{{ ansible_host }}",
   "etcd_host_port": "2379",
-  "etcd_username": "proxy",
-  "etcd_pass": "{{ proxy_pass }}"
+  "etcd_username": "session",
+  "etcd_pass": "{{ session_pass }}"
 }