diff --git a/meta/main.yml b/meta/main.yml index e70cd3ed..b9ef9dcd 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,10 +1,24 @@ --- +# Copyright 2017, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + galaxy_info: author: OpenStack-Ansible description: Deploy Magnum with OpenStack Ansible company: OpenStack license: Apache-2.0 - min_ansible_version: 2.0 + min_ansible_version: 2.2 version: 0.1.0 platforms: - name: Ubuntu diff --git a/tasks/magnum_install.yml b/tasks/magnum_install.yml index c0263a7f..b95d4725 100644 --- a/tasks/magnum_install.yml +++ b/tasks/magnum_install.yml @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: magnum_install_apt.yml - static: no - when: ansible_pkg_mgr == 'apt' +- name: Install distro packages + package: + name: "{{ magnum_distro_packages }}" + state: "{{ magnum_package_state }}" + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" + register: install_packages + until: install_packages|success + retries: 5 + delay: 2 - name: Create developer mode constraint file copy: diff --git a/tasks/magnum_install_apt.yml b/tasks/magnum_install_apt.yml deleted file mode 100644 index e112f4a6..00000000 --- a/tasks/magnum_install_apt.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Copyright 2016, Walmart Stores, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Install apt packages for Magnum - apt: - pkg: "{{ item }}" - state: "{{ magnum_package_state }}" - update_cache: yes - cache_valid_time: "{{ cache_timeout }}" - register: install_magnum_distro_packages - until: install_magnum_distro_packages |success - retries: 5 - delay: 2 - with_items: "{{ magnum_distro_packages }}"