Merge "bugfix: workaround for opencontrail" into stable/brahmaputra

diff --cc deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
index 7b87622,4fbff0b..e38cf52
--- 1/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
--- 2/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml
@@@ -150,23 -156,23 +156,23 @@@
  #    - { section: "DEFAULT", option: "network_api_class", value: "nova.network.neutronv2.api.API" }
  #    - { section: "DEFAULT", option: "libvirt_vif_driver", value: "nova_contrail_vif.contrailvif.VRouterVIFDriver" }
  
 -- name: "set values to nova config"
 -  ini_file:
 -    dest: "/etc/nova/nova.conf"
 -    section: "{{ item.section }}"
 -    option: "{{ item.option }}"
 -    value: "{{ item.value }}"
 -  with_items:
 -    - { section: "DEFAULT", option: "network_api_class", value: "nova_contrail_vif.contrailvif.ContrailNetworkAPI" }
 +#- name: "set values to nova config"
 +#  ini_file:
 +#    dest: "/etc/nova/nova.conf"
 +#    section: "{{ item.section }}"
 +#    option: "{{ item.option }}"
 +#    value: "{{ item.value }}"
 +#  with_items:
 +#    - { section: "DEFAULT", option: "network_api_class", value: "nova_contrail_vif.contrailvif.ContrailNetworkAPI" }
  
 -- name: "restart nova compute"
 -  service:
 -    name: "nova-compute"
 -    state: "restarted"
 +#- name: "restart nova compute"
 +#  service:
 +#    name: "nova-compute"
 +#    state: "restarted"
  
- #- name: "add vrouter to contrail"
- #  shell: "python /opt/contrail/utils/provision_vrouter.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
- #
+ - name: "add vrouter to contrail"
+   shell: "python /opt/contrail/utils/provision_vrouter.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}"
+ 
  #- name: "reboot Server"
  #  shell: "shutdown -r now"
  #  async: 0