X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fchart_repo%2Ftasks%2Fmain.yaml;h=852328dc9b402e7d62d17a91bb6fe48e2f0da3f4;hb=3a4ce452b8f989641a25ec7b539a704168f51858;hp=a5a885b7da87a53d0986c201481d20dc19acc17c;hpb=cf9e279cdad75e3bacaa71fb0323f1284288b73a;p=ta%2Fcaas-helm.git

diff --git a/ansible/roles/chart_repo/tasks/main.yaml b/ansible/roles/chart_repo/tasks/main.yaml
index a5a885b..852328d 100644
--- a/ansible/roles/chart_repo/tasks/main.yaml
+++ b/ansible/roles/chart_repo/tasks/main.yaml
@@ -13,18 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: The swift user is
-  shell: grep "export SWIFT_USER=" /etc/swift/usr/admin/env_file | awk -F"=" '{print($2) }'
-  register: swift_user
-
-- name: The swift tenant is
-  shell: grep "export SWIFT_TENANT=" /etc/swift/usr/admin/env_file | awk -F"=" '{print($2) }'
-  register: swift_tenant
-
-- name: The swift pass is
-  shell: grep "export SWIFT_PASS=" /etc/swift/usr/admin/env_file | awk -F"=" '{print($2) }'
-  register: swift_pass
-
 - name: Chart repo handler template
   template:
     src: "chart-repo.yml"
@@ -36,14 +24,14 @@
     dest: "{{ caas.manifests_directory }}/chart-repo_service.yml"
 
 - name: Authenticate into swift
-  shell: 'curl -XGET -i -H"X-Auth-User:{{ swift_tenant.stdout }}:{{ swift_user.stdout }}" -H"X-Auth-Key:{{ swift_pass.stdout }}" {{ caas.swift }}/auth/v1.0 | grep X-Auth-Token: | awk "{ print \$2 }"'
+  shell: 'curl -ifs -XGET -H"X-Auth-User:{{ caas.swift_credential.tenant }}:{{ caas.swift_credential.user }}" -H"X-Auth-Key:{{ caas.swift_credential.password }}" {{ caas.swift }}/auth/v1.0 | grep X-Auth-Token: | awk "{ print \$2 }"'
   register: SWIFT_AUTH_KEY
 
 - name: Create packages folder/container into swift
-  shell: 'curl -XPUT -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin/packages'
+  shell: 'curl -fs -XPUT -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin/packages'
 
 - name: Read the swift main folder/container and check if is there the packages folder/conatiner
-  shell: 'curl -XGET -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin | grep packages'
+  shell: 'curl -fs -XGET -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin | grep packages'
 
 - name: start chart repo handler
   kubectl: