Michael Marineau
5e4cbcd909
Merge pull request #182 from marineam/fix
...
env_file: fix broken test cases
2014-07-11 14:38:56 -07:00
Michael Marineau
a270c4c737
env_file: fix broken test cases
...
TestWriteEnvFileDos2Unix had a copy/paste bug, it shouldn't have
asserted that mtime doesn't change because the file is actually being
modified in this test. This didn't come up earlier because the actual
comparison wasn't using Time.Equal as it should have.
Instead switch to comparing inode numbers which is the actual thing I
wanted to test for in the first place, just accessing them is much more
awkard. Now all tests where it is relevant check the inode in addition
to the contents.
2014-07-11 13:35:10 -07:00
Michael Marineau
f356a8a690
coreos-cloudinit: bump to 0.8.8+git
2014-07-11 11:13:01 -07:00
Michael Marineau
b1a897d75c
coreos-cloudinit: bump to 0.8.8
2014-07-11 11:12:15 -07:00
Michael Marineau
a55e2cd49b
Merge pull request #178 from marineam/env
...
Write /etc/environment
2014-07-11 10:39:33 -07:00
Michael Marineau
983501e43b
environment: add support for updating /etc/environment with IP values
...
To maintain the behavior of the coreos-setup-environment that has
started to move into cloudinit we need to write out /etc/environment
with the public and private addresses, if known. The file is updated so
that other contents are not replaced. This behavior is disabled entirely
if /etc/environment was written by a write_files entry.
2014-07-11 10:34:44 -07:00
Michael Marineau
81824be3bf
system: new file writer for updating env-style files
...
This can be used to safely update config files cloudinit does not have
exclusive control over. For example update.conf or /etc/environment.
2014-07-10 15:53:32 -07:00
Michael Marineau
98c26440be
Merge pull request #176 from jayofdoom/master
...
Document need for #cloud-config in cloud-config.yml
2014-07-09 16:41:00 -07:00
Jay Faulkner
3b5fcc393b
Document need for #cloud-config in cloud-config.yml
...
- cloud-config.yml does not work if it's missing the #cloud-config
directive at the top. This is undocumented, except in the examples.
2014-07-09 16:36:11 -07:00
Alex Crawford
9528077340
coreos-cloudinit: bump to 0.8.7+git
2014-07-02 15:20:45 -07:00
Alex Crawford
4355a05d55
coreos-cloudinit: bump to 0.8.7
2014-07-02 15:20:26 -07:00
Alex Crawford
52c44923dd
Merge pull request #173 from crawford/metadata
...
metadata-service: remove check for OpenStack meta_data.json
2014-07-02 15:19:37 -07:00
Alex Crawford
47748ef4b6
metadata-service: remove check for OpenStack meta_data.json
...
The meta_data.json blob under OpenStack doesn't actually contain all
of the metadata... Fall back to explicitly requesting each attribute.
2014-07-02 14:38:23 -07:00
Alex Crawford
8eca10200e
coreos-cloudinit: bump to 0.8.6+git
2014-07-01 16:17:00 -07:00
Alex Crawford
43be8c8996
coreos-cloudinit: bump to 0.8.6
2014-07-01 16:16:41 -07:00
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
