aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/open-contrail
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2016-10-12 19:28:54 +0800
committerYifei Xue <xueyifei@huawei.com>2016-10-12 19:28:54 +0800
commit590c421a0ca417820cc2316a08184e116b3e6a74 (patch)
tree1fd18ab5bffa5cea6c67dfd03f620246803c846c /deploy/adapters/ansible/roles/open-contrail
parent63d8f65494ed9e57d29ed1ecbce1caba81677499 (diff)
Move all the tar packages in compass4nfv repo to deploy ISO
JIRA: COMPASS-493 Change-Id: I64c87b50fd88bf193a502568986f560fc2a144f6 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail')
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml15
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml15
-rw-r--r--deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gzbin73771 -> 0 bytes
-rw-r--r--deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gzbin3552 -> 0 bytes
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/vars/main.yml3
5 files changed, 25 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
index d9258ef5..374c4e13 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
@@ -221,10 +221,17 @@
###################### nova plugin workaround #######################
#######################################################################
-- name: "copy nova plugs on compute"
- copy:
- src: "../../templates/nova_contrail_vif.tar.gz"
- dest: "/opt/nova_contrail_vif.tar.gz"
+#- name: "copy nova plugs on compute"
+# copy:
+# src: "../../templates/nova_contrail_vif.tar.gz"
+# dest: "/opt/nova_contrail_vif.tar.gz"
+
+- name: get image http server
+ shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+ register: http_server
+
+- name: download nova plugin package
+ get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ nova_plugin }}" dest=/opt/
- name: "unzip nova plugs"
command: su -s /bin/sh -c "tar xzf /opt/nova_contrail_vif.tar.gz -C /opt/"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
index 32142471..615ac281 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
@@ -247,10 +247,17 @@
############# neutron plugins workaround ##################
###########################################################
-- name: "copy neutron plugs on controller"
- copy:
- src: "../../templates/neutron_plugin_contrail.tar.gz"
- dest: "/opt/neutron_plugin_contrail.tar.gz"
+#- name: "copy neutron plugs on controller"
+# copy:
+# src: "../../templates/neutron_plugin_contrail.tar.gz"
+# dest: "/opt/neutron_plugin_contrail.tar.gz"
+
+- name: get image http server
+ shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+ register: http_server
+
+- name: download neutron_plugin_contrail package
+ get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ neutron_plugin }}" dest=/opt/
- name: "unzip neutron plugs"
command: su -s /bin/sh -c "tar xzf /opt/neutron_plugin_contrail.tar.gz -C /opt/"
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz b/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz
deleted file mode 100644
index 08077049..00000000
--- a/deploy/adapters/ansible/roles/open-contrail/templates/neutron_plugin_contrail.tar.gz
+++ /dev/null
Binary files differ
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz b/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz
deleted file mode 100644
index 78dac037..00000000
--- a/deploy/adapters/ansible/roles/open-contrail/templates/nova_contrail_vif.tar.gz
+++ /dev/null
Binary files differ
diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml
index 6facb475..582e41e8 100755
--- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml
@@ -17,6 +17,9 @@ contrail_keystone_address: "{{ public_vip.ip }}"
contrail_admin_user: "admin"
contrail_admin_password: "console"
+neutron_plugin: neutron_plugin_contrail.tar.gz
+nova_plugin: nova_contrail_vif.tar.gz
+
# network infor adapter for compass
# contrail_address: "{{ internal_ip }}"