valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,005 Commits 24 Branches 182 Tags 341 MiB
170e8238c8
Commit Graph

44 Commits

Author SHA1 Message Date
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
 2016-06-11 12:33:37 +01:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02:00
Jeffrey 'jf' Lim
ffa788fd67 Fix minor typo in test name in tests/unit/states/dockerng_test.py 2016-06-07 01:11:30 +08:00
Nicolas Delaby
87b70186c3 When move a function to a new namespace, allow to keep original context. (#32943) 2016-04-29 10:48:20 -07:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
 2016-04-13 09:42:54 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present. 
fixes #32493
 2016-04-13 15:47:13 +02:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery 
[dockerng] Port and Volume comparison should consider Dockerfile
 2016-03-07 11:25:19 -07:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names. 
Because docker inspect network returns attached containers by their Ids.
 2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile 
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
 2016-03-07 10:11:52 +01:00
Nicolas Delaby
d2bcc37416 Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-24 10:08:03 -07:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +01:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Richard Hansen
eb6f289fc1 change default for volume_present()'s force parameter to False 
This is safer, as it avoids surprising the user with permanent data
loss.
 2016-02-05 09:41:19 -07:00
Richard Hansen
34f3057e04 add 'force' to replace (or not) volumes with driver mismatch 
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver.  Set the default to True to preserve existing
behavior.
 2016-02-05 09:41:18 -07:00
Richard Hansen
68b51be869 add additional states.dockerng.volume_present() unit tests 
The unit tests now test for the bug fixed in the previous commit
(among other things).
 2016-02-04 10:07:51 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Nicolas Delaby
cb9cb463b0 Provide states for managing docker volumes 2015-12-02 17:27:20 +01:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Erik Johnson
2d51f3d25b tests/unit/states/dockerng_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Nicolas Delaby
48f20b9739 Do not call inspect_image if we know the image is not downloaded 2015-07-06 14:01:25 +02:00
Nicolas Delaby
82ee2da750 Enforce environment values to be strings. 2015-05-23 15:52:36 +02:00
Nicolas Delaby
1f68d2d9a9 Update test to follow new argument name 2015-05-22 18:36:50 +02:00
Nicolas Delaby
8b7ddcbbf7 Introduce check_is_running 2015-05-22 18:36:26 +02:00
Nicolas Delaby
09d934b1ac Fix pull images 
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
 2015-05-22 15:51:27 +02:00
Nicolas Delaby
b681f71eb3 compare images by ID not by name 
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
 2015-05-22 14:31:19 +02:00
Nicolas Delaby
5f8f24b655 Related to #23975 and apply same logic for ports and port_bindings 2015-05-21 09:49:21 +02:00
Erik Johnson
8ad8b527b6 Update test to mock dockerng.history 2015-05-20 13:54:20 -05:00
rallytime
f45c7bdfca Add boilerplate unit test pieces to new dockerng_test file 
Also fixes pylint errors in original PR.

Refs #23851
 2015-05-18 13:04:14 -06:00
Nicolas Delaby
df48ac2b91 volumes path, on create, should be the one inside the container 
not from the host
 2015-05-18 14:30:44 +02:00