1
diff --git a/Makefile b/Makefile
2
index eb7767a..42c8033 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -81,7 +81,7 @@ unittests:
6
81
81
7
82
functional: build
82
functional: build
8
83
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
83
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
10
84
	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} CHARM_LOCATION=${PROJECTPATH} tox -e func
84
	@cd src && ZAZA_FEATURE_BUG472=1  CHARM_BUILD_DIR=${CHARM_BUILD_DIR} CHARM_LOCATION=${PROJECTPATH} tox -e func
11
85
85
12
86
functional-extra: build
86
functional-extra: build
13
87
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
87
	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
14
diff --git a/charmcraft.yaml b/charmcraft.yaml
15
index d64e474..9aa96d7 100644
16
--- a/charmcraft.yaml
17
+++ b/charmcraft.yaml
18
@@ -4,7 +4,9 @@ parts:
19
4
    source: src
4
    source: src
20
5
    plugin: reactive
5
    plugin: reactive
21
6
    build-snaps: 
6
    build-snaps: 
23
7
      - charm
7
      # if it is build with charm/3.x it cannot be installed on bionic
24
8
      # Error: pip requires Python '>=3.7' but the running Python is 3.6.9
25
9
      - charm/2.x/stable
26
8
bases:
10
bases:
27
9
    - build-on:
11
    - build-on:
28
10
        - name: ubuntu
12
        - name: ubuntu
29
diff --git a/src/reactive/graylog.py b/src/reactive/graylog.py
30
index 2fb7469..b6f4313 100644
31
--- a/src/reactive/graylog.py
32
+++ b/src/reactive/graylog.py
33
@@ -1360,7 +1360,10 @@ def tls_request_certificate(tls):
34
1360
    set_conf("web_tls_cert_file", CERT_PATH)
1360
    set_conf("web_tls_cert_file", CERT_PATH)
35
1361
    set_conf("web_tls_key_file", CERT_KEY_PATH)
1361
    set_conf("web_tls_key_file", CERT_KEY_PATH)
36
1362
1362
38
1363
    set_conf("http_publish_uri", "https://0.0.0.0:{}/".format(get_api_port()))
1363
    set_conf(
39
1364
        "http_publish_uri",
40
1365
        validate_api_uri("https://0.0.0.0:{}/".format(get_api_port())),
41
1366
    )
42
1364
    set_state("graylog.certificates.configured")
1367
    set_state("graylog.certificates.configured")
43
1365
    remove_state("graylog.initial_certs_received")
1368
    remove_state("graylog.initial_certs_received")
44
1366
1369
Reviewer	Review Type	Date Requested	Status
Eric Chen		2022-10-04	Approve on 2022-10-12
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2022-10-05
BootStack Reviewers		2022-10-04	Pending
Review via email: mp+430948@code.launchpad.net