Alex Crawford
19b4b1160e
Merge pull request #171 from crawford/err
...
metadata-service: Handle no user-data
2014-07-01 16:15:32 -07:00
Alex Crawford
ce6fccfb3c
metadata-service: Handle no user-data
2014-07-01 16:10:18 -07:00
Alex Crawford
7d89aefb82
coreos-cloudinit: bump to 0.8.5+git
2014-07-01 15:45:49 -07:00
Alex Crawford
2369e2a920
coreos-cloudinit: bump to 0.8.5
2014-07-01 15:45:23 -07:00
Alex Crawford
6d808048d3
Merge pull request #170 from crawford/metadata
...
metadata: Fetch the public and private IP addresses
2014-07-01 15:44:14 -07:00
Alex Crawford
276f0b5d99
metadata: Fetch the public and private IP addresses
2014-07-01 14:43:19 -07:00
Jonathan Boulle
92bd5ca5d4
coreos-cloudinit: bump to 0.8.4+git
2014-07-01 12:16:09 -07:00
Jonathan Boulle
5b5ffea126
coreos-cloudinit: bump to 0.8.4
2014-07-01 12:15:48 -07:00
Jonathan Boulle
18068e9375
Merge pull request #169 from jonboulle/pebkac
...
coreos-cloudinit: apply environment to userdata string
2014-07-01 12:15:06 -07:00
Jonathan Boulle
1b3cabb035
coreos-cloudinit: apply environment to userdata string
2014-07-01 12:08:42 -07:00
Jonathan Boulle
1be2bec1c2
coreos-cloudinit: bump to 0.8.3+git
2014-06-30 22:12:13 -07:00
Jonathan Boulle
f3bd5f543e
coreos-cloudinit: bump to 0.8.3
2014-06-30 22:11:15 -07:00
Jonathan Boulle
660feb59b9
Merge pull request #168 from jonboulle/foo
...
fix ordering error in mergeCloudConfig
2014-06-30 22:08:47 -07:00
Jonathan Boulle
9673dbe12b
coreos-cloudinit: fix ordering error in merge invocation
2014-06-30 22:07:05 -07:00
Alex Crawford
2be435dd83
coreos-cloudinit: bump to 0.8.2+git
2014-06-30 18:11:14 -07:00
Alex Crawford
2d91369596
coreos-cloudinit: bump to 0.8.2
2014-06-30 18:10:20 -07:00
Alex Crawford
d8d3928978
Merge pull request #167 from crawford/sshkeys
...
metadata-service: fix ssh key retrieval and application
2014-06-30 18:08:04 -07:00
Alex Crawford
7fcc540154
metadata-service: fix ssh key retrieval and application
...
The metadata service wasn't properly fetching the ssh keys from metadata.
Drop the key traversal in favor of explict key urls.
2014-06-30 17:45:08 -07:00
Jonathan Boulle
cb7fbd4668
Merge pull request #166 from jonboulle/merge
...
cloudinit: merge cloudconfig info from user-data and meta-data
2014-06-30 11:27:47 -07:00
Jonathan Boulle
d4e048a1f4
ParseUserData: return nil on empty input string
2014-06-30 11:27:33 -07:00
Jonathan Boulle
231c0fa20b
initialize: add tests for ParseMetadata
2014-06-27 23:53:06 -07:00
Jonathan Boulle
1aabacc769
cloudinit: merge cloudconfig info from user-data and meta-data
...
This attempts to retrieve cloudconfigs from two sources: the meta-data
service, and the user-data service. If only one cloudconfig is found,
that is applied to the system. If both services return a cloudconfig,
the two are merged into a single cloudconfig which is then applied to
the system.
Only a subset of parameters are merged (because the meta-data service
currently only partially populates a cloudconfig). In the event of any
conflicts, parameters in the user-data cloudconfig take precedence over
those in the meta-data cloudconfig.
2014-06-27 23:48:48 -07:00
Alex Crawford
6a2927d701
coreos-cloudinit: bump to 0.8.1+git
2014-06-27 15:00:05 -07:00
Alex Crawford
126188510b
coreos-cloudinit: bump to 0.8.1
2014-06-27 14:59:56 -07:00
Alex Crawford
4627ccb444
Merge pull request #165 from crawford/units
...
units: update dependencies
2014-06-27 14:55:48 -07:00
Alex Crawford
aff372111a
units: update dependencies
2014-06-27 14:29:59 -07:00
Alex Crawford
c7081b9918
coreos-cloudinit: bump to 0.8.0+git
2014-06-27 11:33:56 -07:00
Alex Crawford
9ba3b18b59
coreos-cloudinit: bump to 0.8.0
2014-06-27 11:32:52 -07:00
Alex Crawford
099de62e9a
Merge pull request #164 from crawford/datasources
...
datasources: Add support for specifying multiple datasources
2014-06-27 00:25:09 -07:00
Alex Crawford
c089216cb5
datasources: Add support for specifying multiple datasources
...
If multiple sources are specified, the first available source is used.
2014-06-26 22:32:39 -07:00
Alex Crawford
68dc902ed1
HttpClient: Refactor timeout into two seperate functions
2014-06-26 15:16:22 -07:00
Jonathan Boulle
ad66b1c92f
Merge pull request #163 from jonboulle/net
...
coreos-cloudinit: restrict convert-netconf to configdrive
2014-06-25 14:35:27 -07:00
Jonathan Boulle
fbdece2762
coreos-cloudinit: restrict convert-netconf to configdrive
2014-06-25 14:28:11 -07:00
Jonathan Boulle
f85eafb7ca
Merge pull request #162 from jonboulle/fffffffffffffffffff
...
initialize/env: handle nil substitution maps properly
2014-06-25 12:10:00 -07:00
Jonathan Boulle
f0dba2294e
initialize/env: handle nil substitution maps properly
2014-06-25 12:07:48 -07:00
Alex Crawford
bda3948382
Merge pull request #159 from crawford/metadata
...
metadataService: Check both ec2 and openstack urls more explicitly
2014-06-25 11:26:19 -07:00
Alex Crawford
fae81c78f3
metadataService: Check both ec2 and openstack urls more explicitly
...
Remove the root url parameter for -from-metadata-service since this
is a guarenteed value. Additionally, check for both ec2 and openstack
urls for the metadata and userdata. Fix a bug with the -from-url
option and a panic on an empty response.
2014-06-25 11:19:11 -07:00
Alex Crawford
a5dec7d7bd
cloudconfig: Process metadata before userdata
...
This gives the options in userdata a higher precedence over metadata.
2014-06-25 10:35:26 -07:00
Jonathan Boulle
e1222c9885
Merge pull request #161 from jonboulle/doc
...
metadata: add links to metadata source information
2014-06-25 08:55:26 -07:00
Jonathan Boulle
ded3bcf122
metadata: add links to metadata source information
2014-06-24 19:26:07 -07:00
Jonathan Boulle
80d00cde94
Merge pull request #158 from jonboulle/nettttt
...
cloudinit: retrieve IPv4 addresses from metadata
2014-06-24 19:11:15 -07:00
Jonathan Boulle
2805d70ece
initialize/env: add notes about tests
2014-06-24 18:52:08 -07:00
Jonathan Boulle
439b7e8b98
initialize/env: fall back to COREOS_*_IPV4 env variables
2014-06-24 18:49:49 -07:00
Jonathan Boulle
ba1c1e97d0
cloudinit: retrieve IPv4 addresses from metadata
...
This uses the new MetadataService implementation to retrieve values for
$private_ipv4 and $public_ipv4 substitutions, instead of using
environment variables.
2014-06-24 17:46:06 -07:00
Alex Crawford
8a50fd8595
Merge pull request #154 from crawford/metadata
...
metadata-service: Add new datasource to download from metadata service
2014-06-24 15:18:27 -07:00
Alex Crawford
465bcce72c
metadata_service: Add tests for constructing metadata
2014-06-24 15:08:03 -07:00
Alex Crawford
361edeebc6
metadata-service: Add metadata-service datasource
...
Move the old metadata-service datasource to url datasource. This new datasource
checks for the existance of meta-data.json and if it doesn't exist, walks the
meta-data directory to build a metadata blob.
2014-06-24 15:08:03 -07:00
Jonathan Boulle
29a7b0e34f
Merge pull request #155 from jonboulle/etcd
...
etcdenvironment: order map keys consistently
2014-06-24 15:02:04 -07:00
Alex Crawford
8496ffb53a
HttpClient: Wrap errors with error classes
2014-06-24 15:01:31 -07:00
Jonathan Boulle
2c717a6cd1
Merge pull request #157 from jonboulle/core
...
coreos-cloudinit: clean up flag handling
2014-06-24 14:57:18 -07:00
