commit fc6b64bd2f65d83ce9b4cded5e3928868dcf1324
author Zack Williams <zdw@opennetworking.org> Fri Dec 22 15:57:50 2017 -0700
committer Zack Williams <zdw@opennetworking.org> Wed Jan 03 22:42:07 2018 +0000
tree 5e5d220358535f3aa8bc642550300658308c0825
parent d23d800f263dbf90ac57ae779cfe0817c8a60e15

[CORD-2460]
Update and fix build documentation, fix variables with new TOSCA engine

Change-Id: I21b5e3aa2abda0111a72d1a994140ab2894296ce

roles/create-epc/defaults/main.yml

diff --git a/roles/create-epc/defaults/main.yml b/roles/create-epc/defaults/main.yml
index 542f13d..13a4aec 100644
--- a/roles/create-epc/defaults/main.yml
+++ b/roles/create-epc/defaults/main.yml
@@ -16,6 +16,9 @@
 
 # roles/create-epc/defaults/main.yml
 
+head_credentials_dir: "/opt/credentials"
+
 xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', '/opt/credentials/xosadmin@opencord.org') }}"
-epc_blueprint: "build"
\ No newline at end of file
+head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
+
+epc_blueprint: "build"

roles/create-epc/tasks/main.yml

diff --git a/roles/create-epc/tasks/main.yml b/roles/create-epc/tasks/main.yml
index ddad05f..fca4c96 100644
--- a/roles/create-epc/tasks/main.yml
+++ b/roles/create-epc/tasks/main.yml
@@ -20,7 +20,7 @@
   uri:
     url: http://localhost/xosapi/v1/vepc/vepcserviceinstances
     user: "{{ xos_admin_user }}"
-    password: "{{ xos_admin_pass }}"
+    password: "{{ head_xos_admin_pass }}"
     return_content: yes
   register: result
 
@@ -28,7 +28,7 @@
   uri:
     url: http://localhost/xosapi/v1/vepc/vepcservices
     user: "{{ xos_admin_user }}"
-    password: "{{ xos_admin_pass }}"
+    password: "{{ head_xos_admin_pass }}"
     return_content: yes
   register: vepcservice
   when: not result.json["items"]
@@ -37,7 +37,7 @@
   uri:
     url: http://localhost/xosapi/v1/vepc/vepcserviceinstances
     user: "{{ xos_admin_user }}"
-    password: "{{ xos_admin_pass }}"
+    password: "{{ head_xos_admin_pass }}"
     method: POST
     body:
       blueprint: "{{ epc_blueprint }}"