Merge pull request #1447 from dtantsur/no-inspector-endpoint

🌱 Remove traces of IRONIC_INSPECTOR_ENDPOINT in BMO
metal3-io · Nov 21, 2023 · 044e07e · 044e07e
2 parents 5d71e71 + 3edc30e
commit 044e07e
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,6 @@ export OPERATOR_NAME=baremetal-operator
 export DEPLOY_KERNEL_URL=http://172.22.0.1:6180/images/ironic-python-agent.kernel
 export DEPLOY_RAMDISK_URL=http://172.22.0.1:6180/images/ironic-python-agent.initramfs
 export IRONIC_ENDPOINT=http://localhost:6385/v1/
-export IRONIC_INSPECTOR_ENDPOINT=http://localhost:5050/v1/
 export GO111MODULE=on
 export GOFLAGS=
 

diff --git a/config/default/ironic.env b/config/default/ironic.env
@@ -4,6 +4,5 @@ DHCP_RANGE=172.22.0.10,172.22.0.100
 DEPLOY_KERNEL_URL=http://172.22.0.2:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
diff --git a/config/overlays/e2e/ironic.env b/config/overlays/e2e/ironic.env
@@ -3,7 +3,6 @@ PROVISIONING_IP=192.168.222.199
 DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://192.168.222.199:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://192.168.222.199:5050/v1/
 CACHEURL=http://192.168.222.199/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0

diff --git a/config/render/capm3.yaml b/config/render/capm3.yaml
@@ -2140,7 +2140,6 @@ data:
   HTTP_PORT: "6180"
   IRONIC_ENDPOINT: http://172.22.0.2:6385/v1/
   IRONIC_FAST_TRACK: "true"
-  IRONIC_INSPECTOR_ENDPOINT: http://172.22.0.2:5050/v1/
   PROVISIONING_INTERFACE: eth2
 kind: ConfigMap
 metadata:

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -16,9 +16,6 @@ drivers that support ISO boot. Optional if kernel/ramdisk are set.
 `IRONIC_ENDPOINT` -- The URL for the operator to use when talking to
 Ironic.
 
-`IRONIC_INSPECTOR_ENDPOINT` -- The URL for the operator to use when talking to
-Ironic Inspector.
-
 `IRONIC_CACERT_FILE` -- The path of the CA certificate file of Ironic, if needed
 
 `IRONIC_INSECURE` -- ("True", "False") Whether to skip the ironic certificate

diff --git a/docs/dev-setup.md b/docs/dev-setup.md
@@ -48,7 +48,6 @@
     export DEPLOY_KERNEL_URL=http://172.22.0.1/images/ironic-python-agent.kernel
     export DEPLOY_RAMDISK_URL=http://172.22.0.1/images/ironic-python-agent.initramfs
     export IRONIC_ENDPOINT=http://localhost:6385/v1/
-    export IRONIC_INSPECTOR_ENDPOINT=http://localhost:5050/v1
     make run
     ```
 

diff --git a/hack/generate.sh b/hack/generate.sh
@@ -28,7 +28,6 @@ else
     --env DEPLOY_KERNEL_URL=http://172.22.0.1/images/ironic-python-agent.kernel \
     --env DEPLOY_RAMDISK_URL=http://172.22.0.1/images/ironic-python-agent.initramfs \
     --env IRONIC_ENDPOINT=http://localhost:6385/v1/ \
-    --env IRONIC_INSPECTOR_ENDPOINT=http://localhost:5050/v1/ \
     --volume "${PWD}:/go/src/github.com/metal3-io/baremetal-operator:rw,z" \
     --entrypoint sh \
     --workdir /go/src/github.com/metal3-io/baremetal-operator \

diff --git a/hack/ironic_ci.env b/hack/ironic_ci.env
@@ -5,6 +5,5 @@ DHCP_RANGE=172.22.0.10,172.22.0.100
 DEPLOY_KERNEL_URL=http://172.22.0.2:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
-IRONIC_FAST_TRACK=true
+IRONIC_FAST_TRACK=true
diff --git a/hack/unit.sh b/hack/unit.sh
@@ -21,7 +21,6 @@ else
     --env DEPLOY_KERNEL_URL=http://172.22.0.1/images/ironic-python-agent.kernel \
     --env DEPLOY_RAMDISK_URL=http://172.22.0.1/images/ironic-python-agent.initramfs \
     --env IRONIC_ENDPOINT=http://localhost:6385/v1/ \
-    --env IRONIC_INSPECTOR_ENDPOINT=http://localhost:5050/v1/ \
     --volume "${PWD}:/go/src/github.com/metal3-io/baremetal-operator:rw,z" \
     --entrypoint sh \
     --workdir /go/src/github.com/metal3-io/baremetal-operator \

diff --git a/ironic-deployment/components/keepalived/ironic_bmo_configmap.env b/ironic-deployment/components/keepalived/ironic_bmo_configmap.env
@@ -5,7 +5,6 @@ DHCP_RANGE=172.22.0.10,172.22.0.100
 DEPLOY_KERNEL_URL=http://172.22.0.2:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0
diff --git a/ironic-deployment/default/ironic_bmo_configmap.env b/ironic-deployment/default/ironic_bmo_configmap.env
@@ -4,7 +4,6 @@ DHCP_RANGE=172.22.0.10,172.22.0.100
 DEPLOY_KERNEL_URL=http://172.22.0.2:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0

diff --git a/ironic-deployment/overlays/e2e/ironic_bmo_configmap.env b/ironic-deployment/overlays/e2e/ironic_bmo_configmap.env
@@ -3,7 +3,6 @@ PROVISIONING_IP=192.168.222.199
 DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel
 DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://192.168.222.199:6385/v1/
-IRONIC_INSPECTOR_ENDPOINT=http://192.168.222.199:5050/v1/
 CACHEURL=http://192.168.222.199/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0

diff --git a/tools/run_local_ironic.sh b/tools/run_local_ironic.sh
@@ -89,7 +89,6 @@ DEPLOY_KERNEL_URL="${DEPLOY_KERNEL_URL:-"http://${CLUSTER_PROVISIONING_IP}:${HTT
 DEPLOY_RAMDISK_URL="${DEPLOY_RAMDISK_URL:-"http://${CLUSTER_PROVISIONING_IP}:${HTTP_PORT}/images/ironic-python-agent.initramfs"}"
 DEPLOY_ISO_URL=${DEPLOY_ISO_URL:-}
 IRONIC_ENDPOINT="${IRONIC_ENDPOINT:-"${IRONIC_BASE_URL}:6385/v1/"}"
-IRONIC_INSPECTOR_ENDPOINT="${IRONIC_INSPECTOR_ENDPOINT:-"${IRONIC_BASE_URL}:5050/v1/"}"
 CACHEURL="${CACHEURL:-"http://${PROVISIONING_IP}/images"}"
 IRONIC_FAST_TRACK="${IRONIC_FAST_TRACK:-"true"}"
 IRONIC_REVERSE_PROXY_SETUP=${IRONIC_REVERSE_PROXY_SETUP:-"true"}
@@ -112,7 +111,6 @@ DEPLOY_KERNEL_URL=${DEPLOY_KERNEL_URL}
 DEPLOY_RAMDISK_URL=${DEPLOY_RAMDISK_URL}
 DEPLOY_ISO_URL=${DEPLOY_ISO_URL}
 IRONIC_ENDPOINT=${IRONIC_ENDPOINT}
-IRONIC_INSPECTOR_ENDPOINT=${IRONIC_INSPECTOR_ENDPOINT}
 CACHEURL=${CACHEURL}
 IRONIC_FAST_TRACK=${IRONIC_FAST_TRACK}
 IRONIC_KERNEL_PARAMS=${IRONIC_KERNEL_PARAMS}