summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-01-21 08:42:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-21 08:42:21 +0000
commit919154145a95b2d90d043986660ea07d9eb7ba63 (patch)
tree891275015b7d3491259f77a4ceaac7213309eebd
parent0ae3c2c9bb7fb1e88b4f3fe76911f672f2ee70ee (diff)
parenta71082cd23709876b0477fadb794f65f95b2854b (diff)
Merge "bugfix: opencontrail parameter network_api_class in nova.conf to nova.network.neutronv2.api.API" into stable/brahmaputra
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml24
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 }}"