diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2017-11-21 12:04:46 -0700 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2017-11-21 12:04:46 -0700 |
| commit | 2bb7e9dee43365bb70c926e47e551d05e57971da (patch) | |
| tree | b5db38d1607a523a033df6ed0e44bc77d2a8d91e | |
| parent | 8f503e0aff61fd4b39b76cb8dd793c8554d6132c (diff) | |
ditch diskimage-builder because it is actually slower
| -rw-r--r-- | pillar/openbook/ansible.sls | 6 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/diskimage_builder.yaml | 51 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/install_openbook_docker_slave.yaml | 1 |
3 files changed, 0 insertions, 58 deletions
diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index 867dc65..2b6fb11 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -57,12 +57,6 @@ ansible: mode: "0644" relative_to_buildroot: True is_template: False - playbooks_diskimage_builder_yaml: - name: playbooks/diskimage_builder.yaml - source: diskimage_builder.yaml - mode: "0644" - relative_to_buildroot: True - is_template: False playbooks_docker_compose_yaml: name: playbooks/docker_compose.yaml source: docker_compose.yaml diff --git a/salt/openbook/ansible/files/diskimage_builder.yaml b/salt/openbook/ansible/files/diskimage_builder.yaml deleted file mode 100644 index 4a0fbfd..0000000 --- a/salt/openbook/ansible/files/diskimage_builder.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -- name: "Install diskimage-builder" - hosts: all - tasks: - - name: "Update apt" - apt: - update_cache: yes - when: ansible_distribution == "Ubuntu" - - - name: "Install packages" - apt: - pkg: "{{ item }}" - state: present - with_items: - - qemu - - parted - - kpartx - - python-yaml - when: ansible_distribution == "Ubuntu" - - - name: "Discover whether pip is installed" - shell: which pip && echo "true" || echo "false" - register: pip_installed - - - name: "Install pip" - shell: | - mkdir -p /tmp/pip - cd /tmp/pip - wget https://bootstrap.pypa.io/get-pip.py - python get-pip.py - pip install --upgrade pip dib-utils networkx - when: ansible_distribution == "Ubuntu" and pip_installed.stdout == "false" - - - name: "Install diskimage-builder" - shell: | - mkdir -p /tmp/diskimage-builder - cd /tmp/diskimage-builder - git clone https://github.com/openstack/diskimage-builder.git - cd diskimage-builder - pip install --upgrade -r requirements.txt - python setup.py install - when: ansible_distribution == "Ubuntu" - - - name: "Install packages" - portage: - name: "{{ item }}" - state: present - with_items: - - app-emulation/diskimage-builder - - app-emulation/qemu - when: ansible_distribution == "Gentoo" diff --git a/salt/openbook/ansible/files/install_openbook_docker_slave.yaml b/salt/openbook/ansible/files/install_openbook_docker_slave.yaml index e294ea8..ebcec43 100644 --- a/salt/openbook/ansible/files/install_openbook_docker_slave.yaml +++ b/salt/openbook/ansible/files/install_openbook_docker_slave.yaml @@ -1,7 +1,6 @@ --- - include: salt.yaml - include: docker.yaml -- include: diskimage_builder.yaml - include: mysql_client.yaml - include: openjdk.yaml - include: gradle.yaml |