Skip to content

Commit 93e0c8e

Browse files
committed
add ironic-vnc-container
1 parent 72a543e commit 93e0c8e

29 files changed

+1123
-21
lines changed

.github/workflows/build-container-reuse.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ on:
2727
type: string
2828
default: 'latest'
2929
description: 'Tag name to use for latest (e.g., "latest" or "2025.2")'
30+
context_path:
31+
required: false
32+
type: string
33+
default: '{{ defaultContext }}'
34+
description: 'Path to docker context'
3035

3136
jobs:
3237
build:
@@ -71,6 +76,7 @@ jobs:
7176
with:
7277
file: ${{ inputs.dockerfile_path }}
7378
build-args: ${{ inputs.build_args }}
79+
context: ${{ inputs.context_path }}
7480
pull: true
7581
push: true
7682
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/containers-openstack.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@ on:
66
- v*
77
branches:
88
- main
9-
paths:
10-
- "containers/**"
9+
paths: &triggerpaths
10+
- "containers/cinder/**"
11+
- "containers/glance/**"
12+
- "containers/horizon/**"
13+
- "containers/ironic/**"
14+
- "containers/keystone/**"
15+
- "containers/neutron/**"
16+
- "containers/nova/**"
17+
- "containers/octavia/**"
18+
- "containers/openstack-client/**"
19+
- "containers/placement/**"
1120
- ".github/workflows/containers-openstack.yaml"
1221
- ".github/workflows/build-container-reuse.yaml"
1322
- "python/**"
1423
pull_request:
1524
types: [opened, synchronize, reopened, closed]
16-
paths:
17-
- "containers/**"
18-
- ".github/workflows/containers-openstack.yaml"
19-
- ".github/workflows/build-container-reuse.yaml"
20-
- "python/**"
25+
paths: *triggerpaths
2126
workflow_dispatch:
2227
merge_group:
2328
types: [checks_requested]

.github/workflows/containers.yaml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ on:
66
- v*
77
branches:
88
- main
9-
paths:
9+
paths: &triggerpaths
1010
- "ansible/**"
11-
- "containers/**"
11+
- "containers/ansible/**"
12+
- "containers/dnsmasq/**"
13+
- "containers/ironic-nautobot-client/**"
14+
- "containers/ironic-vnc-client/**"
15+
- "containers/understack-tests/**"
1216
- ".github/workflows/containers.yaml"
1317
- ".github/workflows/build-container-reuse.yaml"
1418
pull_request:
1519
types: [opened, synchronize, reopened, closed]
16-
paths:
17-
- "ansible/**"
18-
- "containers/**"
19-
- ".github/workflows/containers.yaml"
20-
- ".github/workflows/build-container-reuse.yaml"
20+
paths: *triggerpaths
2121
workflow_dispatch:
2222
merge_group:
2323
types: [checks_requested]
@@ -27,13 +27,22 @@ jobs:
2727
strategy:
2828
matrix:
2929
container:
30-
- ansible
31-
- dnsmasq
32-
- ironic-nautobot-client
33-
- understack-tests
30+
- name: ansible
31+
target: prod
32+
- name: dnsmasq
33+
target: prod
34+
- name: ironic-nautobot-client
35+
target: prod
36+
- name: understack-tests
37+
target: prod
38+
- name: ironic-vnc-container
39+
target: ''
40+
dockerfile_path: Dockerfile
41+
context_path: "{{defaultContext}}:containers/ironic-vnc-container/"
3442
uses: ./.github/workflows/build-container-reuse.yaml
3543
secrets: inherit
3644
with:
37-
container_name: ${{ matrix.container }}
38-
dockerfile_path: containers/${{ matrix.container }}/Dockerfile
39-
target: prod
45+
container_name: ${{ matrix.container.name }}
46+
dockerfile_path: ${{ matrix.container.dockerfile_path || format('containers/{0}/Dockerfile', matrix.container.name) }}
47+
target: ${{ matrix.container.target }}
48+
context_path: ${{ matrix.container.context_path || '{{defaultContext}}' }}

components/ironic/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ conf:
105105
use_web_server_for_images: true
106106
nova:
107107
auth_type: password
108+
vnc:
109+
enable: true
110+
container_provider: kubernetes
111+
console_image: ghcr.io/understack/ironic-console-image:latest
112+
# kubernetes_container_template: $pybasedir/console/container/ironic-console-pod.yaml.template
108113

109114
endpoints:
110115
oslo_messaging:
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM ubuntu:noble
2+
3+
# firefox-esr is installed from the mozillateam ppa because the ubuntu
4+
# packaged fedora exits with a message to install the snap
5+
6+
RUN apt-get update && \
7+
apt-get install -y \
8+
dumb-init \
9+
iproute2 \
10+
procps \
11+
psmisc \
12+
python3-requests \
13+
software-properties-common \
14+
x11vnc \
15+
xvfb && \
16+
add-apt-repository ppa:mozillateam/ppa && \
17+
apt-get install -y \
18+
firefox-esr && \
19+
useradd --create-home --shell /bin/bash firefox
20+
21+
ENV DISPLAY_WIDTH=1280
22+
ENV DISPLAY_HEIGHT=960
23+
24+
ENV APP='fake'
25+
ENV APP_INFO={}
26+
ENV READ_ONLY=False
27+
ENV DEBUG=0
28+
ENV FIREFOX=firefox-esr
29+
ENV FIREFOX_CONFIG_DIR=/home/firefox/.mozilla/firefox-esr
30+
ENV EXTENSION_PATH="/usr/lib/firefox-esr-addons/extensions/@ironic-console.openstack.org"
31+
32+
ADD bin/* /usr/local/bin
33+
ADD drivers /drivers
34+
ADD extension /usr/lib/firefox-esr-addons/extensions/@ironic-console.openstack.org
35+
36+
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
37+
CMD ["/usr/local/bin/start-x11vnc.sh"]
Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Attribution
2+
Obtained from https://opendev.org/openstack/ironic.git /tools/vnc-container
3+
Upstream commit: 856238c56acb669c8e10cf1f0e0f4e0c9467c7e9
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env python3
2+
3+
import hashlib
4+
import json
5+
import os
6+
import socket
7+
import ssl
8+
import sys
9+
10+
from urllib.parse import urlparse
11+
12+
app_name = os.environ.get("APP", "fake")
13+
app_info = json.loads(os.environ.get("APP_INFO"))
14+
verify = app_info.get("verify_ca", True)
15+
print("""# PSM Certificate Override Settings file
16+
# This is a generated file! Do not edit.
17+
""")
18+
19+
address = app_info.get("address")
20+
if verify or not address:
21+
sys.exit(0)
22+
23+
try:
24+
parsed_url = urlparse(address)
25+
addr = parsed_url.hostname
26+
port = parsed_url.port or 443
27+
28+
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
29+
context.check_hostname = False
30+
context.verify_mode = ssl.CERT_NONE
31+
32+
with socket.create_connection((addr, int(port)), timeout=5) as sock:
33+
with context.wrap_socket(sock, server_hostname=addr) as wrappedSocket:
34+
der_cert_bin = wrappedSocket.getpeercert(True)
35+
36+
digest = hashlib.sha256(der_cert_bin).hexdigest()
37+
formatted_digest = ':'.join(
38+
a + b for a, b in zip(digest[::2], digest[1::2])).upper()
39+
40+
print(f"{addr}:{port}:\tOID.2.16.840.1.101.3.4.2.1\t{formatted_digest}\t")
41+
except Exception as e:
42+
print("# Problem fetching certificate fingerprint.")
43+
print(f"# {e}")

0 commit comments

Comments
 (0)