From: bborbely <botond.borbely@nokia.com>
Date: Fri, 19 Jul 2019 10:44:19 +0000 (+0200)
Subject: remove swift_admin_pass from dockerreg
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=commitdiff_plain;h=83fe528257a74893d0761ebd467ff604aa80cb62

remove swift_admin_pass from dockerreg

Change-Id: I522429baf4606a9892b7dc28d4bb61e19ec16b15
Signed-off-by: bborbely <botond.borbely@nokia.com>
---

diff --git a/SPECS/registry.spec b/SPECS/registry.spec
index 080608b..ec321d4 100644
--- a/SPECS/registry.spec
+++ b/SPECS/registry.spec
@@ -15,7 +15,7 @@
 %define COMPONENT registry
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.7.1
-%define RPM_MINOR_VERSION 3
+%define RPM_MINOR_VERSION 4
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/ansible/roles/registry/templates/main/dockerreg.yml b/ansible/roles/registry/templates/main/dockerreg.yml
index 7baab71..364d295 100644
--- a/ansible/roles/registry/templates/main/dockerreg.yml
+++ b/ansible/roles/registry/templates/main/dockerreg.yml
@@ -22,7 +22,7 @@ storage:
     enabled: true
   swift:
     username: admin:admin
-    password: {{ swift_admin_pass }}
+    password: {{ caas.swift_credential.password }}
     authurl: {{ caas.swift }}/auth/v1.0
     container: dockerregistry
 http:
diff --git a/ansible/roles/registry/templates/update/dockerreg.yml b/ansible/roles/registry/templates/update/dockerreg.yml
index e81efea..73dfae2 100644
--- a/ansible/roles/registry/templates/update/dockerreg.yml
+++ b/ansible/roles/registry/templates/update/dockerreg.yml
@@ -22,7 +22,7 @@ storage:
     enabled: true
   swift:
     username: admin:admin
-    password: {{ swift_admin_pass }}
+    password: {{ caas.swift_credential.password }}
     authurl: {{ caas.swift_update }}/auth/v1.0
     container: dockerregistry
 http: