commit 1ed76b8521d3b65daf8405a8827a45206be083fc
author Matteo Scandolo <teo@opennetworking.org> Tue Dec 05 13:58:22 2017 -0800
committer Matteo Scandolo <teo@opennetworking.org> Wed Dec 20 19:03:33 2017 +0000
tree 617d7808cc5360ff9bc6553b7060acc210f42ad9
parent 536aee66f8d47cd70f7130ac6067dacfdb8df3ff

[CORD-2349] Migrating REM-CORD

Change-Id: Iae573428e3bee89026262055263f24a32dd12183

roles/compute-node-enable-maas/defaults/main.yml

diff --git a/roles/compute-node-enable-maas/defaults/main.yml b/roles/compute-node-enable-maas/defaults/main.yml
index 62cedcb..a08b076 100644
--- a/roles/compute-node-enable-maas/defaults/main.yml
+++ b/roles/compute-node-enable-maas/defaults/main.yml
@@ -18,7 +18,11 @@
 
 head_cord_profile_dir: "/opt/cord_profile"
 
+credentials_dir: "{{ playbook_dir }}/credentials"
 xos_admin_user: "xosadmin@opencord.org"
+xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
+
+
 maas_xos_admin_pass: "{{ lookup('file', '/opt/credentials/xosadmin@opencord.org') }}"
 
-xos_ui_port: 9000
+xos_tosca_url: "http://xos-tosca/xos-tosca"

roles/compute-node-enable-maas/tasks/main.yml

diff --git a/roles/compute-node-enable-maas/tasks/main.yml b/roles/compute-node-enable-maas/tasks/main.yml
index 5a00ad8..f84315b 100644
--- a/roles/compute-node-enable-maas/tasks/main.yml
+++ b/roles/compute-node-enable-maas/tasks/main.yml
@@ -30,11 +30,14 @@
     - openstack-compute-vtn.yaml
 
 - name: Load TOSCA to add OpenStack compute nodes, over REST
-  xostosca:
-    url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
-    user: "{{ xos_admin_user }}"
-    password:  "{{ maas_xos_admin_pass }}"
-    recipe: "{{ lookup('file', '/tmp/' + item ) }}"
+  uri:
+    url: "{{ xos_tosca_url }}/run"
+    method: POST
+    headers:
+      xos-username: "{{ xos_admin_user }}"
+      xos-password: "{{ xos_admin_pass }}"
+    body: "{{ lookup('file', '/tmp/' + item ) }}"
+    status_code: 200
   with_items:
     - openstack.yaml
     - openstack-compute.yaml
@@ -44,11 +47,13 @@
     seconds: 20
 
 - name: Load TOSCA to enable VTN on OpenStack compute nodes, over REST
-  xostosca:
-    url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
-    user: "{{ xos_admin_user }}"
-    password:  "{{ maas_xos_admin_pass }}"
-    recipe: "{{ lookup('file', '/tmp/' + item ) }}"
+  uri:
+    url: "{{ xos_tosca_url }}/run"
+    method: POST
+    headers:
+      xos-username: "{{ xos_admin_user }}"
+      xos-password: "{{ xos_admin_pass }}"
+    body: "{{ lookup('file', '/tmp/' + item ) }}"
   with_items:
     - vtn-service.yaml
     - openstack-compute-vtn.yaml