X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=blobdiff_plain;f=ansible%2Froles%2Fswift%2Ftasks%2Fpassword_handler.yml;h=576ade516805d3a217137d59cb7b606f6d59508c;hp=72ea66afa1368a5c397ca71d2d47d0db58bfcc96;hb=5d6a4fd8f953fcfa04cb249800f5c324128b7e64;hpb=9513f902e8edab56d18d1579ceb53b6ba257dbc5

diff --git a/ansible/roles/swift/tasks/password_handler.yml b/ansible/roles/swift/tasks/password_handler.yml
index 72ea66a..576ade5 100644
--- a/ansible/roles/swift/tasks/password_handler.yml
+++ b/ansible/roles/swift/tasks/password_handler.yml
@@ -15,18 +15,8 @@
 
 - include_tasks: password_gen.yml
   with_items:
-    - "admin"
     - "registry"
 
-- name: get admin password
-  command: '/usr/bin/curl
-    https://{{ ansible_host }}:{{ caas.etcd_api_port }}/v2/keys/swift/admin
-    --cacert /etc/etcd/ssl/ca.pem
-    --cert /etc/etcd/ssl/etcd{{ nodeindex }}.pem
-    --key /etc/etcd/ssl/etcd{{ nodeindex }}-key.pem'
-  register: admin_pass
-  become_user: "root"
-
 - name: get registry password
   command: '/usr/bin/curl
     https://{{ ansible_host }}:{{ caas.etcd_api_port }}/v2/keys/swift/registry
@@ -43,82 +33,3 @@
 - name: set registry pass
   set_fact:
     swift_registry_pass: "{{ registry_pass.stdout }}"
-
-- name: decode admin pass
-  shell: echo {{ (admin_pass.stdout|from_json).node.value }} | /usr/bin/openssl enc -d -aes-256-cbc -a -pass pass:{{ name }}
-  register: admin_pass
-
-- name: set admin pass
-  set_fact:
-    swift_admin_pass: "{{ admin_pass.stdout }}"
-
-- name: create dirs
-  file:
-    mode: 0750
-    name: /etc/swift/usr/{{ item }}
-    state: directory
-    owner: swift
-    group: swift
-  with_items:
-    - "admin"
-  become_user: "root"
-
-- name: allowing cloud_admin_user to access /etc/swift folder
-  acl:
-    name:  "/etc/swift"
-    entity: "{{ users.admin_user_name }}"
-    etype: user
-    permissions: rx
-    state: present
-  become_user: "root"
-
-- name: allowing cloud_admin_user to access /etc/swift/usr folder
-  acl:
-    name:  "/etc/swift/usr"
-    entity: "{{ users.admin_user_name }}"
-    etype: user
-    permissions: rx
-    state: present
-  become_user: "root"
-
-- name: allowing cloud_admin_user to access /etc/swift/usr/admin folder
-  acl:
-    name:  "/etc/swift/usr/admin"
-    entity: "{{ users.admin_user_name }}"
-    etype: user
-    permissions: rx
-    state: present
-  become_user: "root"
-
-- name: copy admin env_file
-  template:
-    src: main/admin_envfile
-    mode: 0640
-    dest: /etc/swift/usr/admin/env_file
-  become_user: "root"
-
-- name: Copy admin.yml
-  template:
-    src: main/admin.yml
-    mode: 0640
-    dest: /etc/swift/usr/admin/admin.yml
-  become_user: "root"
-
-- name: allowing users.admin_user_name to access /etc/swift/usr/admin/env_file
-  acl:
-    name:  "/etc/swift/usr/admin/env_file"
-    entity: "{{ users.admin_user_name }}"
-    etype: user
-    permissions: r
-    state: present
-  become_user: "root"
-
-- name: allowing cloud_admin_user to access /etc/swift/usr/admin/admin.yml
-  acl:
-    name:  "/etc/swift/usr/admin/admin.yml"
-    entity: "{{ users.admin_user_name }}"
-    etype: user
-    permissions: r
-    state: present
-  become_user: "root"
-