reyk/cloud-agent
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try to get endpoint from "dhcp-server-identifier"

Browse source
This commit is contained in:
Reyk Floeter 2018-01-10 15:10:58 +01:00
commit ee473a4bd6
5 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
agent/cloudinit.c
View file

@ -36,7 +36,7 @@ ec2(struct system_config *sc)
{
free(sc->sc_username);
if ((sc->sc_username = strdup("ec2-user")) == NULL ||
(sc->sc_endpoint = strdup("169.254.169.254")) == NULL) {
(sc->sc_endpoint = strdup(DEFAULT_ENDPOINT)) == NULL) {
log_warnx("failed to set defaults");
return (-1);
}
@ -47,8 +47,8 @@ ec2(struct system_config *sc)
int
cloudinit(struct system_config *sc)
{
/* XXX get endpoint from DHCP lease file */
if ((sc->sc_endpoint = strdup("169.254.169.254")) == NULL) {
if ((dhcp_getendpoint(sc) == -1) &&
(sc->sc_endpoint = strdup(DEFAULT_ENDPOINT)) == NULL) {
log_warnx("failed to set defaults");
return (-1);
}
@ -89,9 +89,8 @@ cloudinit_fetch(struct system_config *sc)
str = NULL;
}
/* userdata */
if ((sc->sc_userdata = metadata(sc, "/latest/user-data", TEXT)) == NULL)
goto fail;
/* userdata (optional) */
sc->sc_userdata = metadata(sc, "/latest/user-data", TEXT);
ret = 0;
fail: