diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-15 12:34:13 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-21 14:48:23 +0000 |
| commit | a4219c125fb57adf6394f7f3e1488eb9aaeb82e4 (patch) | |
| tree | cf536b8c8ad9abe95288779e95654117577f1b86 /deploy/adapters/ansible | |
| parent | 15796b78a4eb2f6632b1e1cbb20f77602edaeb41 (diff) | |
bugfix: nova default parameter does't support vrouter, change to use opencontrail driver
JIRA: COMPASS-270
Change-Id: I8d35a0c5d36b48ea306473784dfd4a23abffaa6e
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 6d0c31acb8e9702824f0697eb9916886b0324797)
Diffstat (limited to 'deploy/adapters/ansible')
| -rwxr-xr-x | deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml | 24 |
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 e38cf52f..4fbff0b7 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 @@ -156,19 +156,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 }}" |