diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2016-11-10 10:59:26 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2016-11-10 14:50:17 +0800 |
| commit | 9edb0f9e48cc923ed443d3d66886713cde9b628d (patch) | |
| tree | 1463ca978963b6570ea143131d64d0b919a0b1f3 /supporting/servers/roles/docker | |
| parent | 939299c36b3cf79f198d4a4849345eabd878973b (diff) | |
Adjust folder structure
Note: this patchset may break existing features, but it will help
to accelerate the refactoring work.
JIRA: QTIP-131
Change-Id: Ie0cd9d185e6b02316878daef905e26f4e533a66b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'supporting/servers/roles/docker')
| -rw-r--r-- | supporting/servers/roles/docker/handlers/main.yml | 4 | ||||
| -rw-r--r-- | supporting/servers/roles/docker/tasks/main.yml | 41 |
2 files changed, 0 insertions, 45 deletions
diff --git a/supporting/servers/roles/docker/handlers/main.yml b/supporting/servers/roles/docker/handlers/main.yml deleted file mode 100644 index 985f8d41..00000000 --- a/supporting/servers/roles/docker/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: starting docker service - become: true - service: name=docker state=started diff --git a/supporting/servers/roles/docker/tasks/main.yml b/supporting/servers/roles/docker/tasks/main.yml deleted file mode 100644 index 1cf3bea0..00000000 --- a/supporting/servers/roles/docker/tasks/main.yml +++ /dev/null @@ -1,41 +0,0 @@ -- name: adding keys - become: true - apt_key: keyserver=hkp://p80.pool.sks-keyservers.net id=0X58118E89F3A912897C070ADBF76221572C52609D - -- name: adding entry for ubuntu - become: true - apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-xenial main' state=present filename='docker' - when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "16.04" - -- name: installing from docker repo - become: true - shell: apt-cache policy docker-engine - when: ansible_distribution == "Ubuntu" and ansible_distribution_version== "16.04" - -- name: adding entry for ubuntu - become: true - apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-trusty main' state=present filename='docker' - when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04" - -- name: updating - become: true - apt: update_cache=yes - -- name: installing docker engine - become: true - apt: name=docker-engine - notify: - - starting docker service - -- name: install pip - become: true - apt: name={{item}} state=installed - with_items: - - python-dev - - python-pip - -- name: install docker-py - become: true - pip: - name: docker-py - version: 1.7.0 |