OpenContrail Script Adapter

JIRA: COMPASS-186

Change-Id: I792bc1b592348c9bcc21d6e3616d7b0b79d13f25
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

8 files changed, 23 insertions, 13 deletions

diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
index 02bc7f81..5dbf9244 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
@@ -6,7 +6,7 @@
 - name: "temporary disable supervisor analytics"
   template:
 #    src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-analytics.override"
 
 - name: "install contrail openstack analytics package"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml
index ea08e49b..3a57fdf0 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml
@@ -2,11 +2,19 @@
 #- hosts: all
 #  sudo: yes
 #  tasks:
-- name: "copy contrail install package temporary"
+#- name: "copy contrail install package temporary"
 #  sudo: True
-  copy:
-    src: "files/{{ package }}"
-    dest: "/tmp/{{ package }}"
+#  copy:
+#    src: "{{ package }}"
+#    dest: "/tmp/{{ package }}"
+
+- name: get image http server
+  shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+  register: http_server
+
+- name: download OpenContrail package file
+  get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ package }}"  dest=/tmp/{{ package }}
+
 
 - name: "install contrail install package"
 #  sudo: True
@@ -49,6 +57,7 @@
   apt:
     deb: "{{ item }}"
   with_items: required_packages.stdout_lines
+  ignore_errors: True
 
 - name: modify source list
 #  sudo: True
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
index 12b6ad28..6c85ce55 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
@@ -5,7 +5,7 @@
 - name: "temporary disable supervisor vrouter"
 #  sudo: True
   template:
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-vrouter.override"
 
 #    - name: "install nova-compute for contrail package"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
index 52459eb8..1d493f58 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
@@ -6,14 +6,14 @@
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-config.override"
 
 - name: "temporary disable neutron server"
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/neutron-server.override"
 
 - name: "install contrail openstack config package"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
index 6bb7fb25..7e917d16 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
@@ -6,14 +6,14 @@
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-control.override"
 
 - name: "temporary disable supervisor dns"
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-dns.override"
 
 - name: "install contrail openstack control package"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
index fea4cef7..68c5946b 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
@@ -6,7 +6,7 @@
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-database.override"
 
 - name: "install contrail openstack database package"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
index 6d4ca035..8b0e3347 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
@@ -2,6 +2,7 @@
 #- hosts: all 
 #  sudo: yes
 #  tasks:
+
 - name: "install Ubuntu kernel"
 #  sudo: True
 #      apt:
@@ -39,7 +40,7 @@
 #      when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic")
   when: (kernel_install) and (ansible_kernel != kernel_required)
 
-handlers:
+#  handlers:
 - name: "Wait for server to come back"
   local_action:
     module: wait_for
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
index d66af675..22156ca3 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
@@ -7,7 +7,7 @@
 #  sudo: True
   template:
 #        src: "templates/override.j2"
-    src: "install/override.j2"
+    src: "../../templates/install/override.j2"
     dest: "/etc/init/supervisor-webui.override"
 
 - name: "install contrail openstack webui package"