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

Add support for @reyk/meta-data username extension

Browse source
This commit is contained in:
Reyk Floeter 2017-06-30 18:29:23 +02:00
parent 0b72288f57
commit 2978fbdefb
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
agent/cloudinit.c
View file

@ -88,7 +88,7 @@ cloudinit_fetch(struct system_config *sc)
sc->sc_addr.ip = sc->sc_endpoint; sc->sc_addr.ip = sc->sc_endpoint;
sc->sc_addr.family = 4; sc->sc_addr.family = 4;
/* hostname */ /* instance-id */
if ((sc->sc_instance = cloudinit_get(sc, if ((sc->sc_instance = cloudinit_get(sc,
"/latest/meta-data/instance-id", NULL)) == NULL) "/latest/meta-data/instance-id", NULL)) == NULL)
goto fail; goto fail;
@ -105,6 +105,13 @@ cloudinit_fetch(struct system_config *sc)
if (agent_addpubkey(sc, str, NULL) != 0) if (agent_addpubkey(sc, str, NULL) != 0)
goto fail; goto fail;
/* optional username - this is an extension by meta-data(8) */
if ((str = cloudinit_get(sc,
"/latest/meta-data/username", NULL)) != NULL) {
free(sc->sc_username);
sc->sc_username = str;
}
/* userdata */ /* userdata */
if ((sc->sc_userdata = cloudinit_get(sc, if ((sc->sc_userdata = cloudinit_get(sc,
"/latest/user-data", &sc->sc_userdatalen)) == NULL) "/latest/user-data", &sc->sc_userdatalen)) == NULL)