Merge lp:~james-page/charms/trusty/openstack-dashboard/xenial-support into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #742 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/742/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #839 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/839/

[lp:~james-page/charms/trusty/openstack-dashboard/xenial-support]

108. By James Page on 2016-02-18

Fixups

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #840 openstack-dashboard-next for james-page mp286508
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/15110975/
Build: http://10.245.162.36:8080/job/charm_lint_check/840/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #744 openstack-dashboard-next for james-page mp286508
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/15110980/
Build: http://10.245.162.36:8080/job/charm_unit_test/744/

[lp:~james-page/charms/trusty/openstack-dashboard/xenial-support]

109. By James Page on 2016-02-18

Rework to make testing easier

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #844 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/844/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #747 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/747/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #340 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15112258/
Build: http://10.245.162.36:8080/job/charm_amulet_test/340/

[lp:~james-page/charms/trusty/openstack-dashboard/xenial-support]

110. By James Page on 2016-02-18

Disable wily-liberty for now

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #851 openstack-dashboard-next for james-page mp286508
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/851/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #754 openstack-dashboard-next for james-page mp286508
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/754/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #349 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15117832/
Build: http://10.245.162.36:8080/job/charm_amulet_test/349/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #353 openstack-dashboard-next for james-page mp286508
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15125511/
Build: http://10.245.162.36:8080/job/charm_amulet_test/353/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #354 openstack-dashboard-next for james-page mp286508
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/354/

[David Ames (thedac)]

Looks good. Merging.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-12-03 22:54:20 +0000
+++ config.yaml	2016-02-18 18:17:57 +0000
@@ -217,4 +217,3 @@
     description: |
        Connect timeout configuration in ms for haproxy, used in HA
        configurations. If not provided, default value of 5000ms is used.
-

=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2015-10-10 23:18:23 +0000
+++ hooks/horizon_utils.py	2016-02-18 18:17:57 +0000
@@ -141,7 +141,10 @@
         'services': ['apache2'],
     }),
     (HAPROXY_CONF, {
-        'hook_contexts': [horizon_contexts.HorizonHAProxyContext()],
+        'hook_contexts': [
+            horizon_contexts.HorizonHAProxyContext(),
+            context.HAProxyContext(singlenode_mode=True),
+        ],
         'services': ['haproxy'],
     }),
     (ROUTER_SETTING, {

=== modified file 'templates/haproxy.cfg'
--- templates/haproxy.cfg	2015-01-21 21:53:06 +0000
+++ templates/haproxy.cfg	2016-02-18 18:17:57 +0000
@@ -1,6 +1,6 @@
 global
-    log 127.0.0.1 local0
-    log 127.0.0.1 local1 notice
+    log {{ local_host }} local0
+    log {{ local_host }} local1 notice
     maxconn 20000
     user haproxy
     group haproxy
@@ -12,23 +12,40 @@
     option tcplog
     option dontlognull
     retries 3
-    timeout queue 1000
-    timeout connect 1000
+{%- if haproxy_queue_timeout %}
+    timeout queue {{ haproxy_queue_timeout }}
+{%- else %}
+    timeout queue 5000
+{%- endif %}
+{%- if haproxy_connect_timeout %}
+    timeout connect {{ haproxy_connect_timeout }}
+{%- else %}
+    timeout connect 5000
+{%- endif %}
+{%- if haproxy_client_timeout %}
+    timeout client {{ haproxy_client_timeout }}
+{%- else %}
     timeout client 30000
+{%- endif %}
+{%- if haproxy_server_timeout %}
+    timeout server {{ haproxy_server_timeout }}
+{%- else %}
     timeout server 30000
+{%- endif %}
 
-listen stats :8888
+listen stats
+    bind {{ local_host }}:{{ stat_port }}
     mode http
     stats enable
     stats hide-version
     stats realm Haproxy\ Statistics
     stats uri /
-    stats auth admin:password
+    stats auth admin:{{ stat_password }}
 
 {% if units %}
 {% for service, ports in service_ports.iteritems() -%}
 listen {{ service }}
-    bind 0.0.0.0:{{ ports[0] }}
+    bind *:{{ ports[0] }}
     {% if prefer_ipv6 -%}
     bind :::{{ ports[0] }}
     {%- endif %}

=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/021-basic-xenial-mitaka' (properties changed: -x to +x)