summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-01-04 15:14:31 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-04 15:14:31 +0000
commit5361c1204f65e51c624433fcff65a6d985cc352a (patch)
treea0be641e24af3237354abbe2a871002073411b75
parentfd84ea047b0d05d7f7ad54a486944a2f57826364 (diff)
parenta44775fe72cd0e48b85e80265b04750ae82ce355 (diff)
Merge "bugfix: annotate the code in annotation in haproxy.cfg.j2"
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml2
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml17
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml56
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j24
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j24
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j24
-rwxr-xr-xdeploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j26
7 files changed, 67 insertions, 26 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
index 08881202..147338c7 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -208,7 +208,7 @@
- name: drop and recreate neutron database
shell: mysql -e "drop database if exists neutron;";
mysql -e "create database neutron character set utf8;";
- mysql -e "grant all on neutron.* to 'neutron'@'%' identified by 'console';";
+ mysql -e "grant all on neutron.* to 'neutron'@'%' identified by '{{ NEUTRON_DBPASS }}';";
su -s /bin/sh -c "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head" neutron;
when: inventory_hostname == haproxy_hosts.keys()[0]
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
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
index e4acf3ea..79ba9479 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2
@@ -12,7 +12,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
disc_server_ip = {{ contrail_haproxy_address }}
disc_server_port = 5998
rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }}
+rabbit_password = {{ RABBIT_PASS }}
multi_tenancy = True
list_optimization_enabled = True
log_file = /var/log/contrail/contrail-api.log
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
index 7ab29f6f..2c45d21a 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2
@@ -8,7 +8,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
disc_server_ip = {{ contrail_haproxy_address }}
disc_server_port = 5998
rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }}
+rabbit_password = {{ RABBIT_PASS }}
log_file = /var/log/contrail/contrail-device-manager.log
log_level = SYS_NOTICE
log_local = 1
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
index 6ad5ec2d..51740de9 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2
@@ -12,7 +12,9 @@ cassandra_server_list = {% for cur_host in groups['opencontrail_database'] %}{{
disc_server_ip = {{ contrail_haproxy_address }}
disc_server_port = 5998
rabbit_server = {{ contrail_haproxy_address }}
-rabbit_port = 5673
+rabbit_port = 5672
+rabbit_user = {{ RABBIT_USER }}
+rabbit_password = {{ RABBIT_PASS }}
region_name = RegionOne
log_file = /var/log/contrail/contrail-svc-monitor.log
log_level = SYS_NOTICE
diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
index 27d033c7..435a4f5c 100755
--- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
+++ b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2
@@ -1,7 +1,7 @@
#contrail-marker-start
listen contrail-stats
-# bind *:5937
+# bind *:5937
bind {{ internal_vip.ip }}:5937
bind {{ public_vip.ip }}:5937
mode http
@@ -12,7 +12,7 @@ listen contrail-stats
# compass has bind neutron-server
#listen neutron-server
# bind *:9696
-#balance roundrobin
+# balance roundrobin
# option nolinger
#{% for host,ip in haproxy_hosts.items() %}
# server {{ host }} {{ ip }}:9697 weight 1 check inter 2000 rise 2 fall 3
@@ -47,7 +47,7 @@ listen contrail-discovery
listen contrail-analytics-api
-# bind *:8081
+# bind *:8081
bind {{ internal_vip.ip }}:8081
bind {{ public_vip.ip }}:8081
balance roundrobin