bugfix: annotate the code in annotation in haproxy.cfg.j2

JIRA: COMPASS-237

Change-Id: Ie796dcc07c57aa170ede924551748d8494469239
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

2 files changed, 54 insertions, 19 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 3e3d6622..495ba6b2 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,10 +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: "restart nova compute"
-#  service:
-#    name: "nova-compute"
-#    state: "restarted"
+- 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: "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 }}"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
index cef5bbff..1e8c7abd 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml
@@ -183,23 +183,25 @@
 #    group: "neutron"
 #    recurse: yes
 
-#- name: "set values to neutron config"
-#  ini_file:
-#    dest: "/etc/neutron/neutron.conf"
-#    section: "{{ item.section }}"
-#    option: "{{ item.option }}"
-#    value: "{{ item.value }}"
-#  with_items:
+- name: "set values to neutron config"
+  ini_file:
+    dest: "/etc/neutron/neutron.conf"
+    section: "{{ item.section }}"
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+  with_items:
 #    - { section: "DEFAULT", option: "bind_port", value: "9697" }
 #    - { section: "DEFAULT", option: "auth_strategy", value: "keystone" }
 #    - { section: "DEFAULT", option: "allow_overlapping_ips", value: "True" }
-#    - { section: "DEFAULT", option: "core_plugin", value: "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" }
-#    - { section: "DEFAULT", option: "api_extensions_path", value: "extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions" }
+    - { section: "DEFAULT", option: "core_plugin", value: "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" }
+    - { section: "DEFAULT", option: "api_extensions_path", value: "extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions" }
 #    - { section: "DEFAULT", option: "rabbit_host", value: "{{ contrail_haproxy_address }}" }
 #    - { section: "DEFAULT", option: "rabbit_port", value: "5673" }
 #    - { section: "DEFAULT", option: "service_plugins", value: "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin" }
-#    - { section: "service_providers", option: "service_provider", value: "LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default" }
-#    - { section: "quotas", option: "quota_driver", value: "neutron_plugin_contrail.plugins.opencontrail.quota.driver.QuotaDriver" }
+    - { section: "DEFAULT", option: "service_plugins", value: " " }
+    - { section: "DEFAULT", option: "notify_nova_on_port_data_changes", value: "False" }
+    - { section: "service_providers", option: "service_provider", value: "LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default" }
+    - { section: "quotas", option: "quota_driver", value: "neutron_plugin_contrail.plugins.opencontrail.quota.driver.QuotaDriver" }
 #    - { section: "quotas", option: "quota_network", value: "-1" }
 #    - { section: "quotas", option: "quota_subnet", value: "-1" }
 #    - { section: "quotas", option: "quota_port", value: "-1" }
@@ -227,10 +229,10 @@
     state: "restarted"
 
 
-#- name: "restart neutron-server"
-#  service:
-#    name: "neutron-server"
-#    state: "restarted"
+- name: "restart neutron-server"
+  service:
+    name: "neutron-server"
+    state: "restarted"
 
 # Compass configured
 #- name: "add neutron service"
@@ -279,3 +281,27 @@
 #    login_tenant_name: "admin"
 #  run_once: yes
 #  when: keystone_provision 
+
+
+
+- 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-server"
+  service:
+    name: "{{ item }}"
+    state: "restarted"
+  with_items:
+    - nova-api
+    - nova-cert
+    - nova-conductor
+    - nova-consoleauth
+    - nova-novncproxy
+    - nova-scheduler