668f322607
Merge branch 'upstream'
2015-11-09 08:15:44 +00:00
30aa7a9acc
use vendoring, build for netbsd/openbsd
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-11-09 07:23:54 +00:00
Alex Crawford
81ffa056bd
log: use log.Print instead of fmt.Print
2015-08-23 19:30:03 -07:00
8c916a8c22
fix partition
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-07-14 15:08:12 +03:00
732ff09ccd
fix for various fdisk versions
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-07-13 15:47:20 +03:00
28db10bbf3
rewrite resize
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-07-10 16:11:45 +03:00
52fc61f2d1
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-06-30 16:04:41 +03:00
8e1ce09b0d
unlock user only if it locked
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-06-04 14:11:39 +03:00
bafcbde165
remove external findmnt dep
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-06-02 23:54:05 +03:00
0deecce2de
fix resize
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-04-08 13:09:25 +03:00
d58264fc8c
fix freebsd
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-04-08 12:00:41 +03:00
Alex Crawford
66ec7d805c
Merge pull request #330 from crawford/etcd
...
config: add support for etcd2
2015-04-07 14:40:47 -07:00
81de7a1151
fix partition resize
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-04-05 17:03:28 +03:00
616b356754
add ubuntu workaround
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-04-05 01:16:48 +03: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
2be9bc5c43
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-30 11:55:46 +03:00
de2a74b621
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-30 10:51:56 +03:00
da65c72ea4
fix
...
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2015-03-30 10:33:17 +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
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
3c93938f8a
decode: refactor file decoding into config package
2015-01-15 15:01:44 -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
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
Thom May
9be836df31
Create an environment file for flannel
...
Rather than using a systemd overlay, allow docker to load the
environment file. This is due to coreos/coreos-overlay#1002
2014-12-29 10:27:22 +00:00
Alex Crawford
ea90e553d1
Merge pull request #282 from crawford/network
...
network: write network units with user units
2014-12-12 15:12:50 -08:00
Alex Crawford
b0cfd86902
network: write network units with user units
...
This allows us to test the network unit generation as well as removing
some special-cased code.
2014-12-12 15:08:03 -08:00
cnelson
112ba1e31f
Added support for the encoding key in write_files
...
Supported encodings are base64, gzip, and base64 encoded gzip
2014-12-09 17:35:33 -08:00
Matthew Hooker
c944e9ef94
Enable configuration of locksmithd
2014-12-04 23:53:31 -08:00
Alex Crawford
ffc54b028c
drop-in: add support for drop-ins
...
This allows a list of drop-ins for a unit to be declared inline within a
cloud-config. For example:
#cloud-config
coreos:
units:
- name: docker.service
drop-ins:
- name: 50-insecure-registry.conf
content: |
[Service]
Environment=DOCKER_OPTS='--insecure-registry="10.0.1.0/24"'
2014-11-26 14:09:35 -08:00
Alex Crawford
420f7cf202
system: clean up TestPlaceUnit()
2014-11-26 10:32:43 -08:00
Alex Crawford
624df676d0
config/unit: move Type() and Group() out of config
2014-11-26 10:32:43 -08:00
Alex Crawford
dcaabe4d4a
system: clean up UnitManager interface
2014-11-26 10:32:43 -08:00
Thom May
333468dba3
the flannel service is called flanneld
2014-11-25 14:00:53 +00:00
Alex Crawford
4a0019c669
config: add support for float64
2014-11-21 16:13:49 -08:00
Alex Crawford
e6593d49e6
config/update: add "off" as a valid strategy
...
It was assumed that the user would specify the reboot strategy as an
unquoted value. In the case that they turn off updates, `off` is
interpreted as a boolean and the normalization pass converts that to
`false`. In the event that the user uses `"off"`, it's interpreted as a
string and not modified.
2014-11-21 10:41:03 -08:00
Alex Crawford
5c80ccacc4
config: fix parsing of file permissions
...
The file permissions can be specified (unfortunately) as a string or an
octal integer. During the normalization step, every field is
unmarshalled into an interface{}. String types are kept in tact but
integers are converted to decimal integers. If the raw config
represented the permissions as an octal, it would be converted to
decimal _before_ it was saved to RawFilePermissions. Permissions() would
then try to convert it again, assuming it was an octal. The new behavior
doesn't assume the radix of the number, allowing decimal and octal
input.
2014-11-20 11:14:44 -08:00
Eugene Yakubovich
a20addd05e
flannel: added flannel support and helper to make dropins
...
fleet, flannel, and etcd all generate dropins from config.
To reduce code duplication, factor out a helper to do that.
2014-11-14 10:45:23 -08:00
Alex Crawford
88e8265cd6
config: seperate AssertValid and AssertStructValid
...
Added an error structure to make it possible to get the specifics of the failure.
2014-11-07 10:14:34 -08:00
Alex Crawford
6e2db882e6
script: move Script into config package
2014-11-07 10:13:52 -08:00
Alex Crawford
3e2823df1b
Merge pull request #256 from crawford/hyphen
...
config: deprecate - in favor of _ for key names
2014-11-03 14:54:23 -08:00
Alex Crawford
1a6cee5305
networkd: remove double-restart workaround
...
The kernel fixed the underlying issue in 763e0ec and e721f87.
2014-11-03 14:11:15 -08:00