Skip to content

Commit a3ef19a

Browse files
committed
disable foreman_proxy, we don't need it anymore
1 parent 271cf52 commit a3ef19a

File tree

2 files changed

+1
-38
lines changed

2 files changed

+1
-38
lines changed

src/playbooks/deploy/deploy.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
candlepin_tomcat_certificate: "{{ localhost_certificate }}"
2323
candlepin_client_key: "{{ client_key }}"
2424
candlepin_client_certificate: "{{ client_certificate }}"
25-
foreman_proxy_ca_certificate: "{{ client_ca_certificate }}"
26-
foreman_proxy_server_key: "{{ server_key }}"
27-
foreman_proxy_server_certificate: "{{ server_certificate }}"
28-
foreman_proxy_client_key: "{{ client_key }}"
29-
foreman_proxy_client_certificate: "{{ client_certificate }}"
3025
foreman_ca_certificate: "{{ server_ca_certificate }}"
3126
foreman_client_key: "{{ client_key }}"
3227
foreman_client_certificate: "{{ client_certificate }}"
@@ -67,5 +62,4 @@
6762
- candlepin
6863
- httpd
6964
- pulp
70-
- foreman_proxy
7165
- foreman

tests/foreman_proxy_test.py

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,6 @@
77
FOREMAN_PROXY_PORT = 9090
88

99

10-
@pytest.fixture(scope="module")
11-
def foreman_proxy_version_curl(server):
12-
return server.run(f"curl -k -s -w '%{{stderr}}%{{http_code}}' https://{FOREMAN_PROXY_HOST}:{FOREMAN_PROXY_PORT}/version")
13-
14-
15-
@pytest.fixture(scope="module")
16-
def foreman_proxy_features_curl(server, certificates):
17-
return server.run(f"curl -k -s -w '%{{stderr}}%{{http_code}}' --cert {certificates['client_certificate']} --key {certificates['client_key']} https://{FOREMAN_PROXY_HOST}:{FOREMAN_PROXY_PORT}/v2/features")
18-
19-
20-
def test_foreman_proxy_service(server):
21-
foreman_proxy = server.service("foreman-proxy")
22-
assert foreman_proxy.is_running
23-
assert foreman_proxy.is_enabled
24-
25-
2610
def test_foreman_proxy_port(server):
2711
foreman_proxy = server.addr(FOREMAN_PROXY_HOST)
28-
assert foreman_proxy.port(FOREMAN_PROXY_PORT).is_reachable
29-
30-
31-
def test_foreman_proxy_version(foreman_proxy_version_curl):
32-
assert foreman_proxy_version_curl.succeeded
33-
assert foreman_proxy_version_curl.stderr == '200'
34-
35-
36-
def test_foreman_proxy_features(foreman_proxy_features_curl):
37-
assert foreman_proxy_features_curl.succeeded
38-
assert foreman_proxy_features_curl.stderr == '200'
39-
40-
41-
def test_pulpcore_feature(foreman_proxy_features_curl):
42-
features = json.loads(foreman_proxy_features_curl.stdout)
43-
assert 'pulpcore' in features.keys()
12+
assert not foreman_proxy.port(FOREMAN_PROXY_PORT).is_reachable

0 commit comments

Comments
 (0)