Merge pull request #158 from metal3-io/revert-154-revert-141-current-tripleo

Use tested packages

Author: metal3-io-bot

Dockerfile

@@ -31,7 +31,7 @@ RUN dd bs=1024 count=2880 if=/dev/zero of=esp.img && \
 FROM docker.io/centos:centos8
 
 RUN dnf install -y python3 python3-requests && \
-    curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/tripleo_repos/main.py | python3 - -b master current && \
+    curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/tripleo_repos/main.py | python3 - -b master current-tripleo && \
     dnf update -y && \
     dnf install -y python3-gunicorn openstack-ironic-api openstack-ironic-conductor crudini \
         iproute dnsmasq httpd qemu-img iscsi-initiator-utils parted gdisk psmisc \

configure-ironic.sh

@@ -26,7 +26,6 @@ host_ip = ::
 api_workers = $NUMWORKERS
 
 [conductor]
-api_url = http://${IRONIC_URL_HOST}:6385
 bootloader = http://${IRONIC_URL_HOST}:${HTTP_PORT}/uefi_esp.img
 automated_clean = ${IRONIC_AUTOMATED_CLEAN}
 
@@ -39,6 +38,9 @@ fast_track = ${IRONIC_FAST_TRACK}
 
 [inspector]
 endpoint_override = http://${IRONIC_URL_HOST}:5050
+
+[service_catalog]
+endpoint_override = http://${IRONIC_URL_HOST}:6385
 EOF
 
 mkdir -p /shared/html