Merge "Move all the tar packages in compass4nfv repo to deploy ISO"

11 files changed, 50 insertions, 12 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/odl-aaa-moon.tar.gz b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/odl-aaa-moon.tar.gz
deleted file mode 100644
index dd03749c..00000000
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/odl-aaa-moon.tar.gz
+++ /dev/null
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
index 25306059..b89b2823 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
@@ -36,8 +36,14 @@
 - name: copy settings.xml
   template: src=settings.xml dest=/root/.m2/settings.xml
 
-- name: upload swift lib
-  unarchive: src=odl-aaa-moon.tar.gz dest=/home/
+#- name: upload swift lib
+#  unarchive: src=odl-aaa-moon.tar.gz dest=/home/
+
+- name: download odl-aaa-moon package
+  get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/moon/{{ odl_aaa_moon }}"  dest=/home/
+
+- name: unarchive odl-aaa-moon package
+  command: su -s /bin/sh -c "tar xvf  /home/{{ odl_aaa_moon }} -C /home/"
 
 - name: install aaa
   shell: >
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml
index da0c9efd..6ccb3dd8 100755
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml
@@ -19,6 +19,8 @@ odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'ma
 odl_extra_features: ['odl-restconf-all','odl-mdsal-clustering','odl-openflowplugin-flow-services','http','jolokia-osgi']
 odl_features: "{{ odl_base_features + odl_extra_features }}"
 
+odl_aaa_moon: odl-aaa-moon.tar.gz
+
 jdk8_pkg_name: jdk-8u51-linux-x64.tar.gz
 
 controller_packages_noarch: []
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz
deleted file mode 100644
index fdbb38fd..00000000
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/files/swift-lib.tar.gz
+++ /dev/null
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
index 4e2651a7..10a513f0 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
@@ -9,6 +9,10 @@
 ---
 - include_vars: "{{ ansible_os_family }}.yml"
 
+- name: get image http server
+  shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+  register: http_server
+
 - include: swift-controller1.yml
   when: inventory_hostname in groups['controller']
 
@@ -42,8 +46,14 @@
     - rsync
   when: inventory_hostname in groups['compute']
 
-- name: upload swift lib
-  unarchive: src=swift-lib.tar.gz dest=/tmp/
+#- name: upload swift lib
+#  unarchive: src=swift-lib.tar.gz dest=/tmp/
+
+- name: download swift lib package
+  get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/moon/{{ swift_lib }}"  dest=/tmp/
+
+- name: unarchive swift lib
+  command: su -s /bin/sh -c "tar xvf  /tmp/{{ swift_lib }} -C /tmp/"
 
 - name: copy swift lib
   command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
index 540068da..dc009551 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/vars/main.yml
@@ -7,6 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+
+swift_lib: swift-lib.tar.gz
+
 packages_noarch: []
 
 services_noarch: []
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
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
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 }}"