668f322607
Merge branch 'upstream'
2015-11-09 08:15:44 +00:00
Xiang Li
bda6668f00
config: add wal_dir into etcd2.go
2015-10-15 09:36:48 -07:00
Nick Owens
5970000589
config: sync fleet options
2015-10-14 11:02:59 -07:00
Alex Crawford
f63fa39a2d
config: format license
2015-09-23 23:19:47 -07:00
Alex Crawford
0ae90f3b22
config: add group and window options for locksmith
...
The regular expression for RebootWindowLength comes from
https://golang.org/pkg/time/#ParseDuration .
2015-09-23 23:19:41 -07:00
kayrus
f92dcb7968
cloudinit: trim trailing whitespaces in #cloud-config header
2015-09-07 18:30:02 +02:00
Alex Crawford
f30727a675
config: update flags for etcd 2.1
2015-08-07 16:20:36 -07:00
José Moreira
7ab84601c3
Add PublicIP opt
2015-07-22 22:54:03 +01:00
Alex Crawford
91fe744bd2
config: specific valid values for ETCD_PROXY
2015-07-21 14:20:10 -07:00
Alex Crawford
c6400f7751
config: recognize Ignition configs and no-op
2015-07-10 16:32:57 -07:00
Alex Crawford
ed4d5fac4c
config: deprecate fetching SSH keys from remote endpoints
2015-04-20 11:23:35 -07:00
Alex Crawford
66ec7d805c
Merge pull request #330 from crawford/etcd
...
config: add support for etcd2
2015-04-07 14:40:47 -07:00
Alex Crawford
94a242cc58
config: add support for etcd2
2015-04-03 17:29:32 -07:00
20416969bd
Merge branch 'master' of github.com:coreos/coreos-cloudinit
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-04-02 13:34:57 +03:00
Alex Crawford
33bc5fc63d
validate: warn on deprecated keys
2015-03-30 13:52:57 -07:00
Alex Crawford
09f6a279ef
config: deprecate etcd2 flags from etcd structure
2015-03-30 13:52:57 -07:00
da65c72ea4
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-30 10:33:17 +03:00
dda4e55470
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-30 10:29:18 +03:00
0c98d05ebf
tst
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-28 20:08:30 +03:00
7449a4a5db
update
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-28 20:04:09 +03:00
5bbc02c647
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-26 11:53:54 +03:00
0bc1edbd9d
Merge branch 'master' into generic
2015-03-26 10:30:02 +03:00
993af2705a
up
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-26 10:23:27 +03:00
Richard Marshall
f5ecc05d62
config/system: add shell user attribute
...
This adds support for specifying the login shell of created users.
2015-03-06 14:16:19 -08:00
Darren Shepherd
672e4c07af
Fix typo, "contents" should be "content"
...
The validation of the encoding for write_files was looking
for a node named "contents" when the node name is "content"
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-02-23 09:17:21 -07:00
Jimmy Cuadra
afbf1dbb3a
Add etcd 2.0 configuration flag support.
2015-02-05 02:57:11 -08:00
Alex Crawford
536f8acf2a
config: remove network config from CloudConfig
2015-01-26 17:35:08 -08:00
Alex Crawford
650a239fdb
metadata: simplify merging of metadata
...
Add an internal field for CloudConfig to make it easier to distinguish.
Instead of creating two CloudConfigs and merging them, just merge the
metadata into the existing CloudConfig.
2015-01-26 16:08:26 -08:00
Alex Crawford
d4c617fc23
config: standardize interface a bit
2015-01-26 15:57:55 -08:00
Jonathan Boulle
c093e44049
Merge pull request #305 from jonboulle/copyright
...
*: switch to line comments for copyright
2015-01-25 10:28:52 -08:00
Jonathan Boulle
be68a8e5cc
*: switch to line comments for copyright
...
Build tags are not compatible with block comments. Also adds copyright
header to a few places it was missing.
2015-01-24 19:32:33 -08:00
Alex Crawford
e9529ede44
config: add support for multiple github users
2015-01-20 13:45:52 -08:00
Alex Crawford
551cbb1e5d
config/validate: add rule for file encoding
2015-01-15 15:01:44 -08:00
Alex Crawford
3c93938f8a
decode: refactor file decoding into config package
2015-01-15 15:01:44 -08:00
Alex Crawford
f61c08c246
config/validate: add rule for coreos.write_files
2015-01-15 15:01:44 -08:00
Alex Crawford
571903cec6
config/validate: add rule for etcd discovery token
2015-01-15 15:01:44 -08:00
Alex Crawford
bdbd1930ed
config/validate: add rule for file paths
2015-01-15 15:01:44 -08:00
Alex Crawford
fc77ba6355
validate: allow promotion of int to float64
2015-01-14 17:54:01 -08:00
Eugene Yakubovich
58f0dadaf9
config: document and update flannel config values
...
Fixes #297
2015-01-13 15:51:47 -08:00
Alex Crawford
5527f09778
config: fix parsing of file permissions
...
These reintroduces the braindead '744' syntax for file permissions. Even
though this number isn't octal, it is assumed by convention to be. In
order to pull this off, coerceNodes() was introduced to try to
counteract the type inferrencing that occurs during the yaml
unmarshalling. The config is unmarshalled twice: once into an empty
interface and once into the CloudConfig structure. The two resulting
node structures are combined together. The nodes from the CloudConfig
process replace those from the interface{} when the types of the two
nodes are compatible. For example, with the input `0744`, yaml
interprets that as the integer 484 giving us the nodes '0744'(string)
and 484(int). Because the types string and int are compatible, we opt to
take the string node instead of the integer.
2014-12-30 16:20:21 +01:00
Alex Crawford
54a64454b9
validate: fix printing for non-string values
2014-12-30 16:20:21 +01:00
Alex Crawford
0e70d4f01f
config: add validity check for file permissions
2014-12-30 16:20:21 +01:00
Alex Crawford
af8e590575
config: change valid tag to use regexp
...
A regular expression is much more useful than a list of strings.
2014-12-30 16:20:21 +01:00
Alex Crawford
40d943fb7a
reboot-strategy: remove the 'false' value
...
Since we no longer do a two-stage unmarshal, the 'false' value will no
longer be necessary.
2014-12-30 16:20:21 +01:00
Alex Crawford
248536a5cd
config: use a YAML transform to normalize keys
...
This removes the problematic two-pass unmarshalling.
2014-12-30 16:20:21 +01:00
Alex Crawford
057ab37364
config: seperate the CoreOS type from CloudConfig
...
Renamed Coreos to CoreOS while I was at it.
2014-12-30 16:20:20 +01:00
Alex Crawford
182241c8d3
config: clean up and remove some tests
...
Small modification to make these align with our test-table-style tests.
Also removed TestCloudConfigInvalidKeys since it hasn't been a useful
test since d3294bcb86
.
2014-12-30 16:19:00 +01:00
Jonathan Boulle
999c38b09b
Godeps: switch to coreos/yaml
2014-12-20 15:31:02 -08:00
Alex Crawford
565a9540c9
Merge pull request #283 from crawford/validate
...
validate: empty user_data is also valid
2014-12-12 15:05:51 -08:00
Alex Crawford
fd10e27b99
validate: empty user_data is also valid
2014-12-12 14:49:42 -08:00