Skip to content

Commit e83258a

Browse files
committed
Add support for deploying designate in standalone
Jira: https://issues.redhat.com/browse/OSPRH-21265
1 parent bb26118 commit e83258a

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

devsetup/scripts/standalone.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ SWIFT_REPLICATED=${SWIFT_REPLICATED:-false}
5555
TLSE_ENABLED=${TLSE_ENABLED:-false}
5656
CLOUD_DOMAIN=${CLOUD_DOMAIN:-localdomain}
5757
OCTAVIA_ENABLED=${OCTAVIA_ENABLED:-false}
58+
DESIGNATE_ENABLED=${DESIGNATE_ENABLED:-false}
5859
TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
5960

6061

@@ -128,6 +129,7 @@ export SWIFT_REPLICATED=${SWIFT_REPLICATED}
128129
export TLSE_ENABLED=${TLSE_ENABLED}
129130
export CLOUD_DOMAIN=${CLOUD_DOMAIN}
130131
export OCTAVIA_ENABLED=${OCTAVIA_ENABLED}
132+
export DESIGNATE_ENABLED=${DESIGNATE_ENABLED}
131133
export HEAT_ENABLED=${HEAT_ENABLED}
132134
export TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
133135

devsetup/scripts/tripleo.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ TRIPLEO_ATTACH_EXTNET=${TRIPLEO_ATTACH_EXTNET:-true}
3636
TRIPLEO_CONFIGURE_DEFAULT_ROUTE=${TRIPLEO_CONFIGURE_DEFAULT_ROUTE:=true}
3737
MANILA_ENABLED=${MANILA_ENABLED:-true}
3838
OCTAVIA_ENABLED=${OCTAVIA_ENABLED:-false}
39+
DESIGNATE_ENABLED=${DESIGNATE_ENABLED:-false}
3940
TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
4041
TLSE_ENABLED=${TLSE_ENABLED:-false}
4142
EDPM_CONFIGURE_HUGEPAGES=${CONFIGURE_HUGEPAGES:-false}
@@ -98,6 +99,7 @@ export CEPH_ARGS="${CEPH_ARGS:--e \$HOME/deployed_ceph.yaml -e /usr/share/openst
9899
export EDPM_COMPUTE_CELLS=${COMPUTE_CELLS:-1}
99100
export MANILA_ENABLED=${MANILA_ENABLED:-true}
100101
export OCTAVIA_ENABLED=${OCTAVIA_ENABLED}
102+
export DESIGNATE_ENABLED=${DESIGNATE_ENABLED}
101103
export TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
102104
export TLSE_ENABLED=${TLSE_ENABLED:-false}
103105
export CLOUD_DOMAIN=${CLOUD_DOMAIN:-localdomain}

devsetup/standalone/openstack.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ TLSE_ENABLED=${TLSE_ENABLED:-false}
2828
CLOUD_DOMAIN=${CLOUD_DOMAIN:-localdomain}
2929
TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
3030
OCTAVIA_ENABLED=${OCTAVIA_ENABLED:-false}
31+
DESIGNATE_ENABLED=${DESIGNATE_ENABLED:-false}
3132
IPA_IMAGE=${IPA_IMAGE:-"quay.io/freeipa/freeipa-server:fedora-41"}
3233

3334
# Use the files created in the previous steps including the network_data.yaml file and thw deployed_network.yaml file.
@@ -36,6 +37,7 @@ IPA_IMAGE=${IPA_IMAGE:-"quay.io/freeipa/freeipa-server:fedora-41"}
3637
export NEUTRON_INTERFACE=eth0
3738
export CTLPLANE_IP=${IP:-192.168.122.100}
3839
export CTLPLANE_VIP=${CTLPLANE_IP%.*}.99
40+
export DESIGNATE_BIND_IP=${DESIGNATE_BIND_IP:-${CTLPLANE_IP%.*}.155}
3941
export CIDR=24
4042
export GATEWAY=${GATEWAY:-192.168.122.1}
4143
export BRIDGE="br-ctlplane"
@@ -87,6 +89,13 @@ parameter_defaults:
8789
tag: baremetal
8890
IronicInspectorInterface: br-baremetal
8991
IronicCleaningDiskErase: metadata
92+
DesignateBindNSRecords:
93+
- ns1.example.com.
94+
- ns2.example.com.
95+
DesignateBackendListenIPs:
96+
- ${DESIGNATE_BIND_IP}
97+
UnboundForwardResolvers:
98+
- 10.88.0.2
9099
EOF
91100

92101
CMD="openstack tripleo deploy"
@@ -127,6 +136,9 @@ fi
127136
if [ "$OCTAVIA_ENABLED" = "true" ]; then
128137
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/octavia.yaml"
129138
fi
139+
if [ "$DESIGNATE_ENABLED" = "true" ]; then
140+
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable-designate.yaml"
141+
fi
130142
if [ "$TELEMETRY_ENABLED" = "true" ]; then
131143
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable-legacy-telemetry.yaml"
132144
fi

devsetup/tripleo/tripleo_install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@ if [ "$OCTAVIA_ENABLED" = "true" ]; then
149149
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/octavia.yaml"
150150
fi
151151

152+
# Add designate bits
153+
DESIGNATE_ENABLED=${DESIGNATE_ENABLED:-false}
154+
if [ "$DESIGNATE_ENABLED" = "true" ]; then
155+
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable-designate.yaml"
156+
fi
157+
152158
TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
153159
if [ "$TELEMETRY_ENABLED" = "true" ]; then
154160
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable-legacy-telemetry.yaml"

0 commit comments

Comments
 (0)