Merge pull request metal3-io#381 from Nordix/dnsmasq-fix-mael

Fix missing environment variables in CI
longkb · Jan 8, 2020 · db39ab6 · db39ab6
2 parents 5b2aae4 + e1b0e40
commit db39ab6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -9,9 +9,10 @@ GIT_COMMIT="$(shell git rev-parse --verify 'HEAD^{commit}')"
 export LDFLAGS="-X github.com/metal3-io/baremetal-operator/pkg/version.Raw=$(shell git describe --always --abbrev=40 --dirty) -X github.com/metal3-io/baremetal-operator/pkg/version.Commit=${GIT_COMMIT}"
 
 # Set some variables the operator expects to have in order to work
+# Those need to be the same as in deploy/ironic_ci.env
 export OPERATOR_NAME=baremetal-operator
-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 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/
 

diff --git a/deploy/ironic_ci.env b/deploy/ironic_ci.env
@@ -0,0 +1,8 @@
+HTTP_PORT=6180
+PROVISIONING_INTERFACE=provisioning
+DHCP_RANGE=172.22.0.10,172.22.0.100
+DEPLOY_KERNEL_URL=http://172.22.0.1:6180/images/ironic-python-agent.kernel
+DEPLOY_RAMDISK_URL=http://172.22.0.1:6180/images/ironic-python-agent.initramfs
+IRONIC_ENDPOINT=http://172.22.0.1:6385/v1/
+IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.1:5050/v1/
+CACHEURL=http://172.22.0.1/images
diff --git a/tools/run_local_ironic.sh b/tools/run_local_ironic.sh
@@ -2,6 +2,8 @@
 
 set -ex
 
+SCRIPTPATH="$(dirname "$(readlink -f "${0}")")"
+
 IRONIC_IMAGE=${IRONIC_IMAGE:-"quay.io/metal3-io/ironic:master"}
 IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"quay.io/metal3-io/ironic-inspector"}
 IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"quay.io/metal3-io/ironic-ipa-downloader:master"}
@@ -42,7 +44,8 @@ fi
 
 # Start image downloader container
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ipa-downloader ${POD} \
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ipa-downloader \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      -v "$IRONIC_DATA_DIR:/shared" "${IPA_DOWNLOADER_IMAGE}" /usr/local/bin/get-resource.sh
 
 sudo "${CONTAINER_RUNTIME}" wait ipa-downloader
@@ -52,29 +55,34 @@ sudo "${CONTAINER_RUNTIME}" wait ipa-downloader
 # See this file for env vars you can set, like IP, DHCP_RANGE, INTERFACE
 # https://github.com/metal3-io/ironic/blob/master/rundnsmasq.sh
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name dnsmasq  ${POD}\
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name dnsmasq \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      -v "$IRONIC_DATA_DIR:/shared" --entrypoint /bin/rundnsmasq "${IRONIC_IMAGE}"
 
 # For available env vars, see:
 # https://github.com/metal3-io/ironic/blob/master/runhttpd.sh
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name httpd ${POD}\
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name httpd \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      -v "$IRONIC_DATA_DIR:/shared" --entrypoint /bin/runhttpd "${IRONIC_IMAGE}"
 
 # https://github.com/metal3-io/ironic/blob/master/runmariadb.sh
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name mariadb ${POD}\
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name mariadb \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      -v "$IRONIC_DATA_DIR:/shared" --entrypoint /bin/runmariadb \
      --env "MARIADB_PASSWORD=$mariadb_password" "${IRONIC_IMAGE}"
 
 # See this file for additional env vars you may want to pass, like IP and INTERFACE
 # https://github.com/metal3-io/ironic/blob/master/runironic.sh
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ironic ${POD}\
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ironic \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      --env "MARIADB_PASSWORD=$mariadb_password" \
      -v "$IRONIC_DATA_DIR:/shared" "${IRONIC_IMAGE}"
 
 # Start Ironic Inspector
 # shellcheck disable=SC2086
-sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ironic-inspector ${POD}\
+sudo "${CONTAINER_RUNTIME}" run -d --net host --privileged --name ironic-inspector \
+     ${POD} --env-file "${SCRIPTPATH}/../deploy/ironic_ci.env" \
      -v "$IRONIC_DATA_DIR:/shared" "${IRONIC_INSPECTOR_IMAGE}"