Skip to content

Commit f330dbb

Browse files
joew7456aedandwith
authored
Rpcos 244 (rackerlabs#962)
* first ironic push * fixing lint errors * fixing merge conlict and yaml lint errors * Fix indentation and comment spacing for linter compliance * Fix YAML indentation for linter compliance * Fix: correct 4-space indentation on line 11 for linter compliance * Fix: correct 4-space indentation on line 11 for linter compliance * Update ironic-rabbitmq-queue.yaml * Update ironic-rabbitmq-queue.yaml * Feat! (Glance): Add sane default policy for image download restrictions (rackerlabs#954) Converting Flex policy to default Genestack Glance policy flex-host-baseline: 85113f87560d1be9eb36e8117d66b5476710f2b2 feat(glance): image_download policy set to prevent export of Rackspace supplied images (rackerlabs#102) And allow tenants (within project) and glance admins to download the image. https://rackspace.atlassian.net/browse/OSPC-1210 * removing ironic inspector container * adding ironic-db-pass and ironic-rabbitmq-pass to the secret creating script. * changed the version in the install-ironic.sh --------- Co-authored-by: Jake Briggs <[email protected]> Co-authored-by: Dan With <[email protected]>
1 parent 7c623a3 commit f330dbb

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

bin/create-secrets.sh

+21
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ ceilometer_rabbitmq_password=$(generate_password 32)
9494
memcached_shared_secret=$(generate_password 32)
9595
grafana_secret=$(generate_password 32)
9696
grafana_root_secret=$(generate_password 32)
97+
ironic-db-password=$(generate_password 32)
98+
ironic-rabbitmq-password=$(generate_password 32)
9799

98100
OUTPUT_FILE="/etc/genestack/kubesecrets.yaml"
99101

@@ -324,6 +326,25 @@ data:
324326
---
325327
apiVersion: v1
326328
kind: Secret
329+
metadata:
330+
name: ironic-db-password
331+
namespace: openstack
332+
type: Opaque
333+
data:
334+
password: $(echo -n $ironic_db_password | base64 -w0)
335+
---
336+
apiVersion: v1
337+
kind: Secret
338+
metadata:
339+
name: ironic-rabbitmq-password
340+
namespace: openstack
341+
type: Opaque
342+
data:
343+
username: $(echo -n "ironic" | base64)
344+
password: $(echo -n $ironic_rabbitmq_password | base64 -w0)
345+
---
346+
apiVersion: v1
347+
kind: Secret
327348
metadata:
328349
name: designate-admin
329350
namespace: openstack

bin/install-ironic.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GLOBAL_OVERRIDES_DIR="/etc/genestack/helm-configs/global_overrides"
44
SERVICE_CONFIG_DIR="/etc/genestack/helm-configs/ironic"
55
BASE_OVERRIDES="/opt/genestack/base-helm-configs/ironic/ironic-helm-overrides.yaml"
66

7-
HELM_CMD="helm upgrade --install ironic openstack-helm/ironic --version 2024.2.4087+f37dd907f-a96a6b95 \
7+
HELM_CMD="helm upgrade --install ironic openstack-helm/ironic --version 2024.2.121+13651f45-628a320c \
88
--namespace=openstack \
99
--timeout 120m"
1010

0 commit comments

Comments
 (0)