diff options
| author |   Justin chi <chigang@huawei.com> | 2016-11-10 23:41:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-10 23:41:12 +0000 |
| commit | 596b2f49378ca246c6ffb0ecc57a546048d89d3b (patch) | |
| tree | 5ee7b7c66e79dd5c0b77c13130b811a224f11bf6 /deploy/adapters/ansible/roles/open-contrail/tasks | |
| parent | 0c420f2c322309b1ab059e1a240ef0ed37828b17 (diff) | |
| parent | b8d18d66c16fab25393cecc7868f45a6d4600e76 (diff) | |
Merge "Move all the tar packages in compass4nfv repo to deploy ISO" into stable/colorado
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml | 15 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml | 15 |
2 files changed, 22 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/" |