diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-04-19 01:03:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-19 01:03:01 +0000 |
| commit | f255fcfcbceaad11647e55b59c33ae29f1a75c0c (patch) | |
| tree | b2688d6af9291f045d640c44b4f00ab5d67a2915 | |
| parent | 14282bec2e84ca3d9f1fc199eaaf839bc0d33b79 (diff) | |
| parent | 0c0d75f00976d4c2e50630221301731a7c298c04 (diff) | |
Merge "Update the port number of Tacker"
3 files changed, 7 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml index d5e70e1a..4f9eea36 100755 --- a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml +++ b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml @@ -77,9 +77,9 @@ - name: provide an endpoint to tacker service shell: > . /opt/admin-openrc.sh; openstack endpoint create --region RegionOne \ - --publicurl 'http://{{ public_vip.ip }}:8890/' \ - --adminurl 'http://{{ internal_vip.ip }}:8890/' \ - --internalurl 'http://{{ internal_vip.ip }}:8890/' tacker + --publicurl 'http://{{ public_vip.ip }}:8888/' \ + --adminurl 'http://{{ internal_vip.ip }}:8888/' \ + --internalurl 'http://{{ internal_vip.ip }}:8888/' tacker when: inventory_hostname == haproxy_hosts.keys()[0] - name: install tacker diff --git a/deploy/adapters/ansible/roles/tacker/templates/haproxy-tacker-cfg.j2 b/deploy/adapters/ansible/roles/tacker/templates/haproxy-tacker-cfg.j2 index 796e59e8..93bbe798 100644 --- a/deploy/adapters/ansible/roles/tacker/templates/haproxy-tacker-cfg.j2 +++ b/deploy/adapters/ansible/roles/tacker/templates/haproxy-tacker-cfg.j2 @@ -1,10 +1,10 @@ listen proxy-tacker_api_cluster - bind {{ internal_vip.ip }}:8890 - bind {{ public_vip.ip }}:8890 + bind {{ internal_vip.ip }}:8888 + bind {{ public_vip.ip }}:8888 mode tcp option tcp-check option tcplog balance source {% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:8890 weight 1 check inter 2000 rise 2 fall 5 + server {{ host }} {{ ip }}:8888 weight 1 check inter 2000 rise 2 fall 5 {% endfor %} diff --git a/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 b/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 index 1b9add7f..2e51496e 100644 --- a/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 +++ b/deploy/adapters/ansible/roles/tacker/templates/tacker.j2 @@ -1,6 +1,6 @@ [DEFAULT] bind_host = {{ internal_ip }} -bind_port = 8890 +bind_port = 8888 auth_strategy = keystone policy_file = /usr/local/etc/tacker/policy.json debug = True |