diff options
author | chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-21 12:29:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-21 12:29:22 +0000 |
commit | bb7a36cbac02a1345e61b29f83cadc6434274249 (patch) | |
tree | af4dc8da8e028d01b710fb8034dc1c9fb8efedc6 /deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml | |
parent | 34a1302918127f0cc08b2d005dd42ac373f253ef (diff) | |
parent | 6c48d465b98f2255d5374903df8c73dbc4e9adaf (diff) |
Merge "bugfix: workaround for opencontrail" into stable/brahmaputra
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml')
-rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml index 33ad6507..7c46f11a 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml @@ -17,7 +17,7 @@ - name: "set contrail device name for ansible" set_fact: - contrail_ansible_device: "ansible_{{ contrail_device }}" + contrail_ansible_device: "ansible_{{ contrail_vhost_device }}" - name: "fix up default pmac" template: @@ -31,7 +31,7 @@ lineinfile: dest: "/etc/contrail/agent_param" regexp: "dev=__DEVICE__" - line: "dev={{ contrail_device }}" + line: "dev={{ contrail_vhost_device }}" - name: "set vrouter agent mode" set_fact: @@ -45,9 +45,9 @@ - name: "delete lines for contrail interface" shell: "{{ item }}" with_items: - - "sed -e '/auto {{ contrail_device }}/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" - - "sed -n -e '/auto {{ contrail_device }}/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" - - "sed -i -e '/auto {{ contrail_device }}/d' /tmp/contrail-interfaces-bottom" + - "sed -e '/auto {{ contrail_vhost_device }}/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" + - "sed -n -e '/auto {{ contrail_vhost_device }}/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" + - "sed -i -e '/auto {{ contrail_vhost_device }}/d' /tmp/contrail-interfaces-bottom" - "sed -i -n -e '/auto .*/,$p' /tmp/contrail-interfaces-bottom" - "cat /tmp/contrail-interfaces-top /tmp/contrail-interfaces-bottom > /etc/network/interfaces" @@ -66,16 +66,16 @@ line: "{{ item }}" state: "present" with_items: - - "auto {{ contrail_device }}" - - "iface {{ contrail_device }} inet manual" - - "\tpre-up ifconfig {{ contrail_device }} up" - - "\tpost-down ifconfig {{ contrail_device }} down" + - "auto {{ contrail_vhost_device }}" + - "iface {{ contrail_vhost_device }} inet manual" + - "\tpre-up ifconfig {{ contrail_vhost_device }} up" + - "\tpost-down ifconfig {{ contrail_vhost_device }} down" - "auto vhost0" - "iface vhost0 inet static" - "\tpre-up /opt/contrail/bin/if-vhost0" - "\tnetwork_name application" - - "\taddress {{ contrail_address }}" - - "\tnetmask {{ contrail_netmask }}" + - "\taddress {{ contrail_vhost_address }}" + - "\tnetmask {{ contrail_vhost_netmask }}" - name: "delete temporary files" file: |