diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-19 21:33:41 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2016-01-21 02:45:36 +0000 |
| commit | d15a9e4a62822af5347bba1f61c41c774de0d8ab (patch) | |
| tree | 07d99b8643f2c84119cdb1b4234dfc3782f94d92 /deploy/adapters/ansible/roles/open-contrail/tasks/provision | |
| parent | ebf474f7dd65ed8d098e80959aec777c202ee7be (diff) | |
bugfix: opencontrail contrail-snmp-collector configuration error
JIRA: COMPASS-280
Change-Id: I51cf44fdf36aa7665ffb7ab04942fb41cefa0027
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/provision')
3 files changed, 6 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml index 4077ba64..1143ec5c 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml @@ -63,7 +63,7 @@ option: "{{ item.option }}" value: "{{ item.value }}" with_items: - - { section: "DEFAULTS", option: "zookeeper", value: "{{ contrail_address }}:2128" } + - { section: "DEFAULTS", option: "zookeeper", value: "{{ contrail_address }}:2181" } - { section: "DISCOVERY", option: "disc_server_ip", value: "{{ contrail_haproxy_address }}" } - { section: "DISCOVERY", option: "disc_server_port", value: "5998" } 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 30d836d9..32ca0cce 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 @@ -54,6 +54,10 @@ regexp: "dev=__DEVICE__" line: "dev={{ contrail_vhost_device }}" +- name: "get last ip address" + shell: expr substr `cat /etc/hostname` 5 1 + register: lastip + - name: "fix up contrail vrouter agent config" template: src: "../../templates/provision/contrail-vrouter-agent-conf.j2" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml index e50f6a63..7fa3ce9a 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml @@ -63,3 +63,4 @@ service: name: "supervisor-webui" state: "restarted" + |