ab97545a52
provisioner/puppet-server: docs
2014-02-24 09:51:48 -08:00
2af91addf9
Merge pull request #796 from Jimdo/puppet-server
...
Add puppet server provisioner
2014-02-24 09:49:27 -08:00
000e5b67ff
provisioner/chef-client: docs and validation key path
2014-02-24 09:45:04 -08:00
d7e6409b9a
provisioner/chef-client: clean up
2014-02-24 08:53:56 -08:00
d0a08e83cf
Merge pull request #855 from Elachance/chef-client-provisioner
...
adding chef-client provisioner
2014-02-24 08:33:11 -08:00
4576093c17
fmt
2014-02-24 08:26:51 -08:00
8c1de9e712
provisioner/ansible-local: better error if missing [GH-836]
2014-02-21 20:30:04 -08:00
a51fbea499
provisioner/ansible-local: style
2014-02-21 15:27:39 -08:00
ee50657097
Merge remote-tracking branch 'upstream/master' into puppet-server
2014-02-18 09:41:10 +01:00
458d90c71d
provisioner/ansible: support {group,host}_vars
...
ansible looks for group and host vars directories as well as playbooks
this revision to the provisioner uploads those as well.
squashed to a single commit by strcrzy.
2014-02-02 09:34:41 -08:00
73bbfab8f1
adding chef-client provisioner
2014-01-25 01:06:55 +00:00
ec1adec029
provisioner/ansible: configurable command / args
...
allow users to provide a replacement command / extra args to the
ansible-local provisioner.
this is useful, for example, to unbuffer output when using the
docker builder, or to modify ansible behavior, like enabling
verbose mode, injecting variables, or changing paths.
2014-01-22 14:34:34 -08:00
75f64ef6af
provisioner/ansible: upload playbooks correctly
...
`Provision` calls uploadFile on each path in playbook_paths, but
playbook_paths can only contain directories, per bf7530ca28
2014-01-17 16:54:20 -08:00
9d01684c1c
Use sudo by default, as in puppet-masterless
2014-01-09 08:51:48 +01:00
58b06526f5
Update docs for puppet-server provisioner
2014-01-08 13:03:03 +01:00
646f4a6dd3
Implement puppet-server provisioner
...
This closely modeled after the same provisioner
in Vagrant.
2014-01-08 12:50:24 +01:00
525802e9e6
provisioner/ansible-local: templates for role, playbook paths [GH-749]
2013-12-27 08:29:31 -07:00
4d3c9e7104
Merge pull request #726 from rocketnova/master
...
provisioner/chef-solo: Chef environment doesn't work for chef-solo
2013-12-18 08:40:13 -08:00
e8d1cc8e31
Fix Puppet Provisioner crash when HieraConfigPath or ManifestDir is specified
...
Prevents the following error,
Build 'amazon-instance' errored: template: tpl11:1:103: executing "tpl11" at <.HieraConfigPath>: HieraConfigPath has arguments but cannot be invoked as function
2013-12-18 19:33:43 +05:30
bb8e9ad71c
Change chef environment to work for chef-solo.
2013-12-17 17:15:37 -08:00
b76a116823
Fix Ansible-local provisioner configuration check for 'playbook_paths' as it was checking for files, not paths
2013-12-12 14:13:23 -06:00
962cedd04c
fmt
2013-12-11 13:43:59 -08:00
10546f6aee
provisioner/puppet-masterless: fix compile
2013-12-11 13:22:00 -08:00
895d87d9eb
provisioner/puppet-masterless: use Go 1.2 template comparators
2013-12-11 12:39:02 -08:00
3a2c04e4e5
provisioner/puppet-masterless: validate manifest_dir is a dir
2013-12-11 11:21:51 -08:00
2986452804
provisioner/puppet-masterless: simplify manifest dir upload
2013-12-11 11:20:22 -08:00
afd0aea8df
Merge branch 'master' into configure-manifest-dir
2013-12-10 09:08:11 +01:00
956f49f439
provisioner/puppet-masterless: check for hiera config path [GH-656]
2013-12-06 19:30:06 -08:00
1a191044e7
Return targetPath
2013-11-25 22:32:14 +01:00
8beaae0d0e
#450 - allow configuration of manifest dir
2013-11-25 08:52:41 +01:00
7472507962
provisioner/chef-solo: test for encrypted data bag secret path config
...
/cc @matheeeny - Tests :)
2013-11-18 15:48:13 -08:00
d56eec8852
provisioner/chef-solo: naming nitpick
...
/cc @matheeeny - I prefer to be more explicit and say this is the path,
rather than the secret value itself.
2013-11-18 15:46:37 -08:00
6dfcf2b347
Add support for passing encrypted data bag secret to chef-solo
...
Adds additional option to chef-solo provisioner for an encrypted data bag
secret file. Local file is copied up and referenced in solo.rb
2013-11-13 13:39:29 -05:00
457b99db3f
provisioner/chef-solo: Say using Chef-solo
2013-11-09 18:47:20 -08:00
d94cff93da
Merge pull request #475 from kelseyhightower/ansible-provisioner
...
provisioner/ansible-local: Add support for provisioning with Ansible
2013-10-20 17:46:36 -07:00
d1c497676a
Merge pull request #514 from rgarcia/salt-masterless-uploaddir
...
provisioner/salt-masterless: use communicator.UploadDir
2013-10-20 17:42:38 -07:00
75bdba7f97
Merge pull request #513 from rgarcia/salt-masterless-mv-bug
...
provisioner/salt-masterless: move states to /srv/salt, not /srv/salt/states
2013-10-20 17:40:27 -07:00
528ae09c37
provisioner/shell: comment on why we return right away if advance == 0
...
/cc @mwhooker
2013-10-15 09:48:12 -10:00
f673ca52ba
provisoiner/shell: append only needs to add a byte for UnixReader
2013-10-15 09:40:47 -10:00
104f5049a7
provisioner/shell: fix EOF detection
...
Fixes #507
The scanUnixLine function was erroneously returning empty lines when EOF
was reached.
This commit adds a test for the problem and changes the scanUnixLine
function to elide the trailing \n if no content was read.
2013-10-15 05:56:10 -07:00
32b9a305a1
provisioner/salt-masterless: use communicator.UploadDir
2013-10-09 18:51:30 -07:00
76393ba285
provisioner/salt-masterless: move states to /srv/salt, not /srv/salt/states
...
Latest version copies local state tree to {tmp}/states and then executes `mv {tmp}/states /srv/salt/`. This creates a `/srv/salt/states` instead of the correct `/srv/salt` directory.
2013-10-09 13:49:30 -07:00
ff970483c4
provisioner/shell: add more tests for UnixReader
2013-10-04 10:47:28 -07:00
5dfe27b40f
provisioner/chef-solo: unused var
2013-10-02 08:29:12 -07:00
543a1a21e8
provisioner/chef-solo: alphabetize tests and such
...
/cc @netshade
2013-10-02 08:28:51 -07:00
fd6415ddf5
formatting
2013-10-01 11:21:16 -04:00
bc8e5d2c41
add environments_path and chef_environment support to chef provisioner
2013-10-01 11:20:36 -04:00
0d1b936f69
Fix UnixReader panic on empty lines.
...
Added a test for the failure.
Most of the scanner code looks like it's a modified version of
bufio.ScanLines, so I changed it to use that but always add a line feed.
2013-10-01 09:06:01 +00:00
b3d76b7945
provisioner/shell: fix provisioner to use UnixReader [GH-477]
...
Packer was using the original file reader when uploading, instead of the UnixReader /cc @mitchellh
2013-09-30 23:54:54 -05:00
89d165aae7
provisioner/shell: add another UnixReader test for sanity
2013-09-30 11:39:24 -07:00
e7b7d71f16
Add tests for ansible provisioner default settings
2013-09-29 15:44:21 -07:00
4d241b96c1
Define the default staging dir using a const var
2013-09-29 15:42:42 -07:00
365f356a0b
Add tests for ansible-local provisioner
2013-09-29 14:54:49 -07:00
ea3677387e
Add ansible-local provisioner
2013-09-29 13:38:37 -07:00
be80edb28e
provisioner/chef-solo: fix .RolesPath and .DataBagsPath in the config template
2013-09-27 19:13:55 +04:00
25924a2d2b
provisioner/puppet-masterless: user variables in puppet vars [GH-448]
2013-09-21 18:28:14 -07:00
abbac36796
provisioner/shell: convert windows line endings to Unix [GH-277]
2013-09-20 10:22:43 -07:00
677f2989b9
provisioner/chef-solo: template doesn't support comp [GH-442]
2013-09-19 11:54:24 -07:00
1b1b535ee5
provisioner/chef-solo: one test per test
...
/cc @jerryclinesmith
2013-09-18 14:19:50 -07:00
ba9d85c744
provisioner/chef-solo: template process roles/data bags path
...
/cc @jerryclinesmith
2013-09-18 14:17:54 -07:00
7034f69f2c
provisioner/chef-solo: move quoting to template
...
/cc @jerryclinesmith - I want the quoting to go into the template. I
realize the cookbooks path doesn't do this and you were following that.
That one is just weird because it is an array and Go templates kind of
suck.
2013-09-18 14:17:07 -07:00
b2d5b15155
fmt
2013-09-18 14:14:18 -07:00
129f1290c1
Merge pull request #411 from jerryclinesmith/issue_348
...
provisioners/chef-solo: add support for roles and data_bags
2013-09-18 14:13:41 -07:00
dc0232975d
provisioner/chef-solo: ability to specify custom chef template
2013-09-15 23:29:29 -07:00
8f5a185818
provisioner/puppet-masterless: remove duplicate manifest upload message
2013-09-13 14:54:28 +02:00
cd2280f3bf
facter vars no longer smush up against puppet command when prevent_sudo is true
2013-09-12 16:52:25 -07:00
fa2f277c67
#348 : chef-solo provisioner: add support for data_bags and roles
2013-09-10 22:00:29 -05:00
8e44971b3d
provisioner/puppet-masterless: proper exit code check
2013-09-09 15:04:13 -07:00
a14a3fe3f1
provisioner/puppet-masterless: detailed exit codes
2013-09-09 15:04:13 -07:00
c83fbc0b42
provisioner/puppet-masterless: better messaging
2013-09-09 14:03:40 -07:00
adbb490189
provisioner/file: support uploading directories [GH-251]
2013-09-09 14:00:06 -07:00
fd0df9ff58
provisioners/puppet-masterless: support hiera configs
2013-09-09 13:24:17 -07:00
41b70aae99
provisioner/puppet-masterless: support custom facts
2013-09-08 23:00:11 -07:00
b92aed5577
provisioner/puppet-masterless: more sane messaging
2013-09-07 23:43:06 -07:00
023678fe7b
provisioner/puppet-masterless: more validation and tests
2013-09-07 23:31:28 -07:00
d854b08642
provisioner/puppet-masterless: rework internals, use SCP
2013-09-07 23:08:56 -07:00
5079fd4f0b
Rename puppet provisioner to puppet-masterless
2013-09-07 22:27:25 -07:00
d37f287f8c
Added basic Puppet provisioner
2013-09-03 08:39:49 -04:00
28bf6122bd
provisioner/*: implement Cancel
2013-08-30 23:23:36 -07:00
55b0b586d3
provisioner/chef-solo: code re-org
2013-08-30 16:35:57 -07:00
662e74d070
provisioner/chef-solo: properly escape user vars for JSON
...
/cc @mwhooker - I moved the processing up into Prepare so that any
errors will be shown during a validate pass. Also, I escape some stuff
in keys. Tests moved as well.
2013-08-30 16:05:04 -07:00
6914baa473
Merge pull request #364 from mwhooker/362
...
provisioner/chef-solo: template expansion of `json`
2013-08-30 15:26:39 -07:00
404ae53a4a
provisioner/salt-masterless: join paths properly
2013-08-30 14:26:29 -07:00
9537f085ae
clean up and retab.
2013-08-28 17:35:43 -07:00
4b76b2d9e3
template expansion of `json` in chef-solo
...
Fixes #362
2013-08-28 17:27:22 -07:00
b4b68bce00
Merge branch 'fix-minion-config-with-non-tmp-dir' of https://github.com/rach/packer into rach-fix-minion-config-with-non-tmp-dir
...
Conflicts:
provisioner/salt-masterless/provisioner.go
2013-08-27 20:21:02 -07:00
64fe98c465
provisioner/chef-solo: template process the configuration
2013-08-27 17:41:49 -07:00
c9ef66651b
fmt
2013-08-27 17:37:29 -07:00
a8694fdda8
Merge pull request #353 from rach/add-setting-for-pillar-folder
...
provisioner/salt-masterless: Add setting for pillar folder
2013-08-27 17:36:28 -07:00
a755be49fa
Add doc and change pillar tree in roots to respect salt vocabulary
2013-08-28 01:01:37 +01:00
7bdb5f9cfb
Add setting for pillar folder to respect saltstack structure
2013-08-28 00:38:36 +01:00
40af1e681a
Fix minion config with non tmp dir
2013-08-27 23:49:04 +01:00
3b097f9805
provisioner/chef-solo: use proper exceute command
2013-08-27 14:35:11 -07:00
87dde46413
provisioner/chef-solo: remove unused constants and variables
2013-08-27 13:32:59 -07:00
e72c06a740
provisioner/chef-solo: upload cookbooks
2013-08-27 13:27:20 -07:00
607372f75a
provisioner/chef-solo: massive refactor and style nitpick
2013-08-27 13:27:20 -07:00
4a5a8c6006
provisioner/chef-solo: installChef fixed up to use tpl and StartWithUi
2013-08-27 13:27:20 -07:00
585cee9b4c
Merge branch 'provisioner-chef-solo' of https://github.com/jvandyke/packer into jvandyke-provisioner-chef-solo
...
Conflicts:
config.go
2013-08-25 20:49:53 -07:00
095631107a
communicator/ssh: UploadDir works properly
2013-08-25 20:30:56 -07:00
80e36f11b9
provisioner/salt-masterless: fix the build
2013-08-23 15:58:30 -07:00
3cb3a7cd30
Fix #264 to upload local minion config
...
Conflicts:
provisioner/salt-masterless/provisioner.go
website/source/docs/provisioners/salt.html.markdown
2013-08-23 15:41:11 -07:00
a46c7afcf7
provisioner/shell: retry the upload if command fails as well
...
This improves reboot handling robustness
2013-08-23 11:21:20 -07:00
717746ce4f
provisioner/shell: retry uploads if reboot [GH-282]
2013-08-19 23:02:06 -07:00
64d87bfaf3
*: switch to packer ConfigTemplate
2013-08-15 19:17:23 -07:00
3ea4c720b1
provisioner/salt-masterless: switch replace to that prior replace works
...
/cc @markpeek
2013-08-12 17:10:50 -07:00
d60b769217
provisioner/salt-masterless: replace windows slash with linux [GH-276]
2013-08-12 16:26:46 -07:00
21f92715c0
provisioner/shell: start_retry_timeout for reboot handling [GH-260]
2013-08-12 15:49:55 -07:00
769c349def
provisioner/salt-masterless: nice error even if bad exit status
...
/cc @rgarcia
2013-08-12 09:19:11 -07:00
fb6d2754da
packer: Add Machine func to Ui
2013-08-11 18:16:00 -07:00
ffa7dff585
fmt
2013-08-11 16:17:59 -07:00
23b856332e
#269 Make local_state_tree option not mandatory
...
Update and rename salt.html.markdown to salt-masterless.html.markdown
salt.html.markdown had a better history and formatting
And remove local_state_tree from required option from code and docs
2013-08-10 16:18:57 +01:00
adfb6caa2b
provisioner/salt-masterless: error if any commands exit with non-zero
...
[GH-266]
/cc @rgarcia
2013-08-09 17:35:57 -07:00
72a7a5e69c
provisioner/salt-masterless: don't delete states [GH-265]
2013-08-09 17:01:39 -07:00
55ad0058bc
provisioner/salt-masterless: convert to new template stuff + user vars
2013-08-09 15:57:08 -07:00
332bdf6edc
builder/*, provisioner/*: set user vars
2013-08-09 15:57:08 -07:00
3f1af409e2
provisioner/shell: tests passing and compiling
2013-08-08 17:25:26 -07:00
f4b0e2248f
provisioner/shell: convert to latest template stuff
2013-08-08 17:25:26 -07:00
bf67c6c36e
provisioner/file: use the template processing stuff
2013-08-08 17:25:26 -07:00
ec556044cd
provisioner/file: state of the art config decoding
2013-08-06 15:30:49 -07:00
25af1c8bd4
provisioner/shell: state of the art config decoding
2013-08-06 15:30:36 -07:00
5b7d8fbc74
rename builder/common to common since it is generally useful
2013-08-01 12:11:54 -07:00
25183e7702
provisioner/salt-masterless: remove Ui
...
/cc @rgarcia Should just pass it in as a param
2013-08-01 10:06:38 -07:00
f7cbdf4112
provisioner/salt-masterless: verify local_state_tree exists
...
/cc @rgarcia
2013-07-31 23:11:08 -07:00
104fe91b48
provisioner/salt-masterless: use Messages for minor steps
...
/cc @rgarcia - "Message" in Ui is the non-bold colored messages and
are meant for sub-messages or steps part of a larger message. "Say"
is used for the bold stuff. This is more in line wit how Packer works.
2013-07-31 23:07:15 -07:00
f3331afb1c
provisioner/salt-masterless: don't capitalize Ui
...
/cc @rgarcia - Not sure why this was capitalized to begin with
2013-07-31 23:06:22 -07:00
7e5c64ca7f
provisioner/salt-masterless: use common lib for config decoding
...
/cc @rgarcia - Since you opened the pull request, common config
decoding stuff has been pulled out into the common Package. This
simplifies a lot of code.
2013-07-31 23:05:15 -07:00
aacca7d066
provisoner/salt-masterless: lowercase package name
...
/cc @rgarcia - I don't know of any Go packages that follow this naming
convention so I just lowercased it.
2013-07-31 23:01:03 -07:00
29993b30e4
provisioner/salt-masterless: rename
2013-07-28 23:30:03 -07:00
7019281ad6
provisioner/salt: use cmd.StartWithUi
2013-07-27 18:12:18 -07:00
5feadedba2
provisioner/salt: simple tests
2013-07-27 00:14:32 -07:00
9c25bb5cd7
provisioner/salt: put state tree temporarily in /tmp/salt by default
2013-07-27 00:14:32 -07:00
8f0d4890d9
provisioner/salt: copy local state tree to remote, run highstate
2013-07-27 00:14:32 -07:00
a74a515aa7
provisioner/salt: pass args to bootstrap
2013-07-27 00:14:32 -07:00
361d7fbf8e
provisioner/salt: install salt
2013-07-27 00:14:32 -07:00
b64a2532f4
provisioner/shell: use StartWithUi
2013-07-23 22:44:32 -05:00
0403932315
Log an upload error closer to when it occurs
...
When there is an error returned from the Upload it is propagated back
to the main loop and may have additional log messages before the actual
error is displayed. This displays a log message close to where the error
actually occurred.
2013-07-17 18:17:46 -07:00
74f36aaebd
Remove debugging statement.
2013-07-15 16:38:26 -04:00
0b5f4d9d17
provisioner/shell: make build name and builder type env vars [GH-154]
2013-07-15 10:07:49 +09:00
3b4ef72e47
Unused keys are invalid in templates [GH-104]
2013-07-14 09:28:56 +09:00
adaceb7766
Remove redundant code and clean up some string concatenation.
...
Clean up Say statements.
2013-07-12 11:09:52 -04:00
6a1d1cfb70
Improve logging.
...
Correct behavior for undefined recipe list.
Correct package name to upstream repo.
2013-07-11 12:22:15 -04:00
0d33f9ae08
Add basic test file for provisioner-chef-solo.
2013-07-11 10:47:51 -04:00
355fdecafa
Merge remote-tracking branch 'upstream/master' into provisioner-chef-solo
...
Conflicts:
config.go
Add the chef-solo provisioner back to config.go.
Fix import path for chef-solo provisioner.
2013-07-10 08:58:00 -04:00
1745d4e831
provisioner/shell: close source script file handle
2013-07-07 20:50:53 -07:00
b22743767e
provisioner/shell: inline_shebang for inline scripts
2013-07-07 17:52:20 -07:00
6a5bbaa05d
Merge pull request #133 from ubermuda/provisioner/shell/script-execution
...
provisioner/shell: execute script directly instead of using /bin/sh
2013-07-07 17:47:25 -07:00
13da0ef49b
Rename configuration `avoid_sudo` to `prevent_sudo`
2013-07-06 00:37:59 -04:00
c24e74c699
Remove errant die statement.
2013-07-06 00:17:28 -04:00
6e1e92f14f
Implement `skip_install` configuration to skip Chef installation.
2013-07-06 00:15:21 -04:00
4e1d0f5a12
Implement `avoid_sudo` configuration option.
2013-07-05 23:56:51 -04:00
5f81e605e8
Rename configuration `cookbook_paths` to `cookbooks_paths` to
...
conform to Vagrant wording.
Remove configuration `cookbook_path` to simplify some things.
2013-07-05 22:33:24 -04:00
543fdbd8c2
Make JSON attributes work with real JSON!
2013-07-05 21:57:56 -04:00
1a2e4f9d0b
fmt
2013-07-05 11:00:18 -07:00
712fd1f8fd
First pass at Chef Solo provisioner.
2013-07-05 00:26:48 -04:00
32aabb6ea2
provisioner/file: style nitpicks
...
/cc @ericlathrop
2013-07-04 12:50:00 -07:00
3957d3dadc
Implement file upload provisioner per #118 .
2013-07-04 15:16:17 -04:00
43db2c23eb
provisioner/shell: execute script directly instead of using /bin/sh
2013-07-03 20:17:31 -04:00
919c3935e1
Merge branch 'shell-env-vars'
...
Conflicts:
website/source/docs/provisioners/shell.html.markdown
2013-06-28 08:20:12 -04:00
d64797cc44
provisioner/shell: remove check for empty env vars config
2013-06-28 14:11:27 +02:00
17d0f5f71b
provisioner/shell: rename "path" to "script"
2013-06-27 10:56:46 -07:00
e9d8e9f537
provisioner/shell: add support for environment variables to be injected
2013-06-27 14:42:14 +02:00
8cb2fd761e
provisioner/shell: Error if a script fails
2013-06-26 17:52:49 -07:00
e8cbb9f9b6
provisioner/shell: Error message if provisioning fails
2013-06-23 17:37:44 -07:00
9367df4a3f
provisioner/shell: copy the scripts [GH-29]
2013-06-23 11:56:49 -07:00
7797676091
provisioner/shell: can specify multiple scripts to provision with
2013-06-20 13:45:54 -07:00
417f7e7f47
fmt
2013-06-11 14:09:31 -07:00
59b5902619
provisioner/shell: Support inline commands
2013-06-11 13:52:32 -07:00
690954cb51
provisioner/shell: validation
2013-06-11 13:42:15 -07:00
4a8278d49b
provisioner/shell: Support setting the execute command
2013-06-06 23:14:31 -07:00
e9b552ba18
provisioner/shell: Remove TODO since we handled it
2013-06-06 22:39:52 -07:00
0a6d8ed75a
packer: Add errors to Prepare
2013-06-06 17:07:42 -07:00
6b87c42ee6
packer: Change provisioner interface to take array of configs
2013-06-06 17:01:12 -07:00
c5d539ef13
command/build: Better prefixes
2013-06-03 11:40:08 -07:00
37937c1290
provisioner/shell: Use RemoteCmd.Wait
2013-06-03 10:56:12 -07:00
fdda64f48e
provisioner/shell: Trim whitespace on output
2013-06-02 23:39:04 -07:00
684df67ca6
provisioner/shell: Adhere to new communicator API
2013-06-02 23:34:55 -07:00
ffcb7afbee
provisioner/shell: Properly handle closed channels in select
2013-06-02 19:03:26 -07:00
cf732a913d
provisioner/shell: stream output in real time
2013-06-01 21:59:33 -07:00
ace53450b9
packer: More efficient RemoteCommand.ExitChan
2013-06-01 17:57:26 -07:00
9ebf0435ff
provisioner/shell: Basic run
2013-05-27 21:54:19 -07:00
f726ea2800
provisioner/shell: Start working on shell provisioner
2013-05-27 15:06:34 -07:00
46a058572b
provisioner/shell and plugin/provisioner-shell
2013-05-23 22:38:40 -07:00
Mitchell Hashimoto
Jan Brauer
Bernard McKeever
Bailey Johnson
jamie brim
Sudharshan S
Rocket
Jake Good
Andrew Matheny
Matthew Hooker
Rafael Garcia
Chris
Jason A. Beranek
Kelsey Hightower
Kirill Kazakov
Jack Pearkes
Justin Clayton
Jerry Clinesmith
James Turnbull
Rachid Belaid
Mark Peek
James Van Dyke
Eric Lathrop
Geoffrey Bachelet