Merge "bugfix: opencontrail parameter network_api_class in nova.conf to nova.network.neutronv2.api.API" into stable/brahmaputra

1 files changed, 12 insertions, 12 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 495ba6b2..7b87622c 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
@@ -150,19 +150,19 @@
 #    - { 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 }}"