summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
863d4e2)
Signed-off-by: bborbely <botond.borbely@nokia.com>
Change-Id: I0ce263042472b79a1e0acbbc0c2c80c0cbf856a1
%define COMPONENT chartrepo
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 1.0.0
%define COMPONENT chartrepo
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 5
+%define RPM_MINOR_VERSION 6
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
%define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
%define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
# See the License for the specific language governing permissions and
# limitations under the License.
# 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"
- name: Chart repo handler template
template:
src: "chart-repo.yml"
dest: "{{ caas.manifests_directory }}/chart-repo_service.yml"
- name: Authenticate into swift
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 -XGET -i -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
register: SWIFT_AUTH_KEY
- name: Create packages folder/container into swift
- name: CHARTREPOHANDLER_LISTENONINTERFACE
value: "{{ caas.internal_flannel_interface }}"
- name: CHARTREPOHANDLER_AUTHKEY
- name: CHARTREPOHANDLER_LISTENONINTERFACE
value: "{{ caas.internal_flannel_interface }}"
- name: CHARTREPOHANDLER_AUTHKEY
- value: "{{ swift_pass.stdout }}"
+ value: "{{ caas.swift_credential.password }}"
- name: CHARTREPOHANDLER_CONTAINER
value: packages
- name: CHARTREPOHANDLER_REPOURL
- name: CHARTREPOHANDLER_CONTAINER
value: packages
- name: CHARTREPOHANDLER_REPOURL