Doing replacement on imagebuild

This commit is contained in:
Josh Gachnang 2014-03-19 16:35:55 -07:00
parent 63fa74582d
commit ececa3bce2
7 changed files with 13 additions and 13 deletions

@ -1,4 +1,4 @@
teeth-agent images ironic-python-agent images
================== ==================
coreos - Builds a CoreOS Ramdisk and Kernel suitable for running teeth-agent coreos - Builds a CoreOS Ramdisk and Kernel suitable for running ironic-python-agent

@ -8,7 +8,7 @@ coreos:
./coreos-oem-inject.py oem UPLOAD ./coreos-oem-inject.py oem UPLOAD
clean: clean:
rm -rf teeth-agent rm -rf ironic-python-agent
rm -f oem/container.tar.gz rm -f oem/container.tar.gz
rm -f UPLOAD/coreos_production_pxe_image-oem.cpio.gz rm -f UPLOAD/coreos_production_pxe_image-oem.cpio.gz
rm -f UPLOAD/coreos_production_pxe.vmlinuz rm -f UPLOAD/coreos_production_pxe.vmlinuz

@ -1,6 +1,6 @@
# teeth-agent CoreOS Image builder. # ironic-python-agent CoreOS Image builder.
Builds a CoreOS image suitable for running the teeth-agent on a server. Builds a CoreOS image suitable for running the ironic-python-agent on a server.
# Requirements # Requirements

@ -15,7 +15,7 @@ if [[ -e "${OUTPUT_FILE}" ]]; then
fi fi
# Build the docker image # Build the docker image
cd ../../teeth-agent cd ../../ironic-python-agent
docker build -t oemdocker . docker build -t oemdocker .
cd - cd -

@ -28,4 +28,4 @@ done
docker load < container.tar.gz docker load < container.tar.gz
systemctl enable --runtime /usr/share/oem/system/* systemctl enable --runtime /usr/share/oem/system/*
systemctl start teeth-agent.service systemctl start ironic-python-agent.service

@ -0,0 +1,6 @@
[Service]
ExecStart=/usr/bin/docker run -p 9999:9999 -privileged=true -v=/sys:/mnt/sys oemdocker /usr/local/bin/ironic-python-agent --ipaddr="`ip a | grep '10\.' | sed -e 's/inet \(10\.[0-9\.]\+\).*/\1/'`"
Restart=always
[Install]
WantedBy=oem.target

@ -1,6 +0,0 @@
[Service]
ExecStart=/usr/bin/docker run -p 9999:9999 -privileged=true -v=/sys:/mnt/sys oemdocker /usr/local/bin/teeth-agent --ipaddr="`ip a | grep '10\.' | sed -e 's/inet \(10\.[0-9\.]\+\).*/\1/'`"
Restart=always
[Install]
WantedBy=oem.target