Merge "replace ansible modules"

10 files changed, 42 insertions, 218 deletions

diff --git a/ansible/roles/check_openstack_services/tasks/main.yml b/ansible/roles/check_openstack_services/tasks/main.yml
index 02e730533..bfd9e1193 100644
--- a/ansible/roles/check_openstack_services/tasks/main.yml
+++ b/ansible/roles/check_openstack_services/tasks/main.yml
@@ -13,13 +13,19 @@
 # limitations under the License.
 ---
 - name: Check images
-  os_images_facts: {}
+  shade_api:
+    method: search_images
+    fact_name: openstack_images
+    args:
+      - ~
   environment: "{{ openrc }}"
 
 - name: Check servers
   os_server_facts: {}
-  environment: "{{ openrc }}"
+#  environment: "{{ openrc }}"
 
 - name: Check stacks
-  os_stack_facts: {}
+  shade_api:
+    method: list_stacks
+    fact_name: openstack_stacks
   environment: "{{ openrc }}"
diff --git a/ansible/roles/clean_images/tasks/main.yml b/ansible/roles/clean_images/tasks/main.yml
index 5cbae06d8..1bc3dc4ef 100644
--- a/ansible/roles/clean_images/tasks/main.yml
+++ b/ansible/roles/clean_images/tasks/main.yml
@@ -13,15 +13,21 @@
 # limitations under the License.
 ---
 - name: Get all images
-  os_images_facts: {}
+  shade_api:
+    method: search_images
+    fact_name: openstack_images
+    args:
+      - ~
   environment: "{{ openrc }}"
 
-- debug: var=openstack_images
+- debug:
+    var: openstack_images
 
 - set_fact:
     images_to_clean: "{{ openstack_images|map(attribute='name')|select('search', 'yardstick|cirros|Ubuntu-14\\.04')|list }}"
 
-- debug: var=images_to_clean
+- debug:
+    var: images_to_clean
 
 - name: Cleanup images
   os_image:
diff --git a/ansible/roles/create_storperf_admin_rc/library/my_os_project_facts.py b/ansible/roles/create_storperf_admin_rc/library/my_os_project_facts.py
deleted file mode 100644
index debb8dd5b..000000000
--- a/ansible/roles/create_storperf_admin_rc/library/my_os_project_facts.py
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2016 Hewlett-Packard Enterprise Corporation
-#
-# This module is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this software.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-
-try:
-    import shade
-    HAS_SHADE = True
-except ImportError:
-    HAS_SHADE = False
-
-DOCUMENTATION = '''
----
-module: os_project_facts
-short_description: Retrieve facts about one or more OpenStack projects
-extends_documentation_fragment: openstack
-version_added: "2.1"
-author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
-description:
-    - Retrieve facts about a one or more OpenStack projects
-requirements:
-    - "python >= 2.6"
-    - "shade"
-options:
-   name:
-     description:
-        - Name or ID of the project
-     required: true
-   domain:
-     description:
-        - Name or ID of the domain containing the project if the cloud supports domains
-     required: false
-     default: None
-   filters:
-     description:
-        - A dictionary of meta data to use for further filtering.  Elements of
-          this dictionary may be additional dictionaries.
-     required: false
-     default: None
-'''
-
-EXAMPLES = '''
-# Gather facts about previously created projects
-- my_os_project_facts:
-    cloud: awesomecloud
-- debug: var=openstack_projects
-
-# Gather facts about a previously created project by name
-- my_os_project_facts:
-    cloud: awesomecloud
-    name: demoproject
-- debug: var=openstack_projects
-
-# Gather facts about a previously created project in a specific domain
-- my_os_project_facts
-    cloud: awesomecloud
-    name: demoproject
-    domain: admindomain
-- debug: var=openstack_projects
-
-# Gather facts about a previously created project in a specific domain
-  with filter
-- my_os_project_facts
-    cloud: awesomecloud
-    name: demoproject
-    domain: admindomain
-    filters:
-      enabled: False
-- debug: var=openstack_projects
-'''
-
-
-RETURN = '''
-openstack_projects:
-    description: has all the OpenStack facts about projects
-    returned: always, but can be null
-    type: complex
-    contains:
-        id:
-            description: Unique UUID.
-            returned: success
-            type: string
-        name:
-            description: Name given to the project.
-            returned: success
-            type: string
-        description:
-            description: Description of the project
-            returned: success
-            type: string
-        enabled:
-            description: Flag to indicate if the project is enabled
-            returned: success
-            type: bool
-        domain_id:
-            description: Domain ID containing the project (keystone v3 clouds only)
-            returned: success
-            type: bool
-'''
-
-def main():
-
-    argument_spec = openstack_full_argument_spec(
-        name=dict(required=False, default=None),
-        domain=dict(required=False, default=None),
-        filters=dict(required=False, type='dict', default=None),
-    )
-
-    module = AnsibleModule(argument_spec)
-
-    if not HAS_SHADE:
-        module.fail_json(msg='shade is required for this module')
-
-    try:
-        name = module.params['name']
-        domain = module.params['domain']
-        filters = module.params['filters']
-
-        opcloud = shade.operator_cloud(**module.params)
-        # module.exit_json(changed=False, ansible_facts=dict(
-        #     openstack_prjects=opcloud.cloud_config.get_auth_args()))
-
-        if domain:
-            try:
-                # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
-                domain = dom
-            except:
-                # If we fail, maybe admin is passing a domain name.
-                # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
-                if dom:
-                    domain = dom[0]['id']
-                else:
-                    module.fail_json(msg='Domain name or ID does not exist')
-
-            if not filters:
-                filters = {}
-
-            filters['domain_id'] = domain
-
-        # projects = opcloud.search_projects(name, filters)
-        projects = opcloud.list_projects(name, filters)
-        module.exit_json(changed=False, ansible_facts=dict(
-            openstack_projects=projects))
-
-    except shade.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
-
-from ansible.module_utils.basic import *
-from ansible.module_utils.openstack import *
-
-if __name__ == '__main__':
-    main()
diff --git a/ansible/roles/install_L4Replay/tasks/main.yml b/ansible/roles/install_L4Replay/tasks/main.yml
deleted file mode 100644
index 1401d1b13..000000000
--- a/ansible/roles/install_L4Replay/tasks/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# there is no clean for L4Replay
-#- my_make: chdir="{{ vnf_build_dir }}/L4Replay" target=clean extra_args="-j {{ ansible_processor_vcpus }}"
-
-- name: Building L4Replay VNF
-  my_make: chdir="{{ NSB_INSTALL_DIR }}/L4Replay" params="RTE_SDK={{ dpdk_path }}"  extra_args="-j {{ ansible_processor_vcpus }}"
-
-- command: cp "{{ NSB_INSTALL_DIR }}/L4Replay/build/L4replay" "{{ INSTALL_BIN_PATH }}/"
-
diff --git a/ansible/roles/install_collectd/tasks/main.yml b/ansible/roles/install_collectd/tasks/main.yml
index c1ea4d994..8368df103 100644
--- a/ansible/roles/install_collectd/tasks/main.yml
+++ b/ansible/roles/install_collectd/tasks/main.yml
@@ -32,7 +32,7 @@
     dest: /tmp
 
 - name: "make collectd install"
-  my_make:
+  make:
     chdir: "{{ collectd_path }}"
     target: install
 
diff --git a/ansible/roles/install_dpdk/tasks/main.yml b/ansible/roles/install_dpdk/tasks/main.yml
index e189eb629..01ad4baf1 100644
--- a/ansible/roles/install_dpdk/tasks/main.yml
+++ b/ansible/roles/install_dpdk/tasks/main.yml
@@ -36,13 +36,9 @@
   set_fact:
     RTE_KERNELDIR: "/lib/modules/{{ dpdk_kernel }}/build"
 
-- my_make:
+- command: make -j {{ ansible_processor_vcpus }} config T={{ dpdk_make_arch }} O={{ dpdk_make_arch }}
+  args:
     chdir: "{{ dpdk_path }}"
-    target: config
-    params:
-      T: "{{ dpdk_make_arch }}"
-      O: "{{ dpdk_make_arch }}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment:
     RTE_KERNELDIR: "{{ RTE_KERNELDIR }}"
 
@@ -85,14 +81,15 @@
 
 # TODO: disable ASLR
 
-- my_make:
+- name: make dpdk
+  command: make -j {{ ansible_processor_vcpus }}
+  args:
     chdir: "{{ dpdk_path }}/{{ dpdk_make_arch}}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment:
     RTE_KERNELDIR: "{{ RTE_KERNELDIR }}"
 
 #- name: make install DPDK into /usr for collectd and other programs
-#  my_make:
+#  make:
 #    chdir: "{{ dpdk_path }}/{{ dpdk_make_arch}}"
 #    target: install
 #    params: "T={{ RTE_TARGET }}"
diff --git a/ansible/roles/install_dpdk_shared/tasks/main.yml b/ansible/roles/install_dpdk_shared/tasks/main.yml
index 6ed9f3bfc..65954be04 100644
--- a/ansible/roles/install_dpdk_shared/tasks/main.yml
+++ b/ansible/roles/install_dpdk_shared/tasks/main.yml
@@ -42,13 +42,9 @@
   set_fact:
     RTE_KERNELDIR: "/lib/modules/{{ dpdk_kernel }}/build"
 
-- my_make:
+- command: make -j {{ ansible_processor_vcpus }} config  T={{ dpdk_make_arch }} O={{ dpdk_make_arch }}
+  args:
     chdir: "{{ dpdk_shared_path }}"
-    target: config
-    params:
-      T: "{{ dpdk_make_arch }}"
-      O: "{{ dpdk_make_arch }}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment:
     RTE_KERNELDIR: "{{ RTE_KERNELDIR }}"
 
@@ -89,26 +85,23 @@
     regexp: '^CONFIG_RTE_EAL_PMD_PATH=""'
     line: 'CONFIG_RTE_EAL_PMD_PATH="{{ dpdk_pmd_path }}"'
 
-- my_make:
+  # no T= target for clean
+- command: make -j {{ ansible_processor_vcpus }} clean O={{ dpdk_make_arch }}
+  args:
     chdir: "{{ dpdk_shared_path }}"
-    target: clean
-    params:
-    # no T= target for clean
-      O: "{{ dpdk_make_arch }}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment:
     RTE_KERNELDIR: "{{ RTE_KERNELDIR }}"
 
 # TODO: disable ASLR
 
-- my_make:
+- command: make -j {{ ansible_processor_vcpus }}
+  args:
     chdir: "{{ dpdk_shared_path }}/{{ dpdk_make_arch}}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment:
     RTE_KERNELDIR: "{{ RTE_KERNELDIR }}"
 
 #- name: make install DPDK into /usr for collectd and other programs
-#  my_make:
+#  make:
 #    chdir: "{{ dpdk_shared_path }}/{{ dpdk_make_arch}}"
 #    target: install
 #    params: "T={{ RTE_TARGET }}"
diff --git a/ansible/roles/install_intel_cmt_cat/tasks/main.yml b/ansible/roles/install_intel_cmt_cat/tasks/main.yml
index fe3bf1464..609e98024 100644
--- a/ansible/roles/install_intel_cmt_cat/tasks/main.yml
+++ b/ansible/roles/install_intel_cmt_cat/tasks/main.yml
@@ -18,8 +18,8 @@
   with_items: "{{ intel_cmt_cat_build_dependencies[ansible_os_family] }}"
 
 - name: "make intel-cmt-cat"
-  my_make:
+  make:
     chdir: "{{ intel_cmt_cat_path }}"
     target: install
-    params: "PREFIX=/usr"
-
+    params:
+      PREFIX: "/usr"
diff --git a/ansible/roles/install_samplevnf/tasks/main.yml b/ansible/roles/install_samplevnf/tasks/main.yml
index b0ea91961..55c4da5e1 100644
--- a/ansible/roles/install_samplevnf/tasks/main.yml
+++ b/ansible/roles/install_samplevnf/tasks/main.yml
@@ -36,16 +36,15 @@
   when: vnf_name == "PROX" and image_type is defined and image_type == "vm"
 
 - name: "make {{ vnf_name }} clean"
-  my_make:
+  command: make -j {{ ansible_processor_vcpus }} clean
+  args:
     chdir: "{{ vnf_build_dir }}"
-    target: clean
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment: "{{ build_env_vars }}"
 
 - name: "make {{ vnf_name }}"
-  my_make:
+  command: make -j {{ ansible_processor_vcpus }}
+  args:
     chdir: "{{ vnf_build_dir }}"
-    extra_args: "-j {{ ansible_processor_vcpus }}"
   environment: "{{ build_env_vars }}"
 
 #- command: cp "{{ vnf_build_dir }}/{{ vnf_name }}/build/ip_pipeline" "{{ INSTALL_BIN_PATH }}/vACL_vnf"
diff --git a/ansible/roles/install_yajl/tasks/main.yml b/ansible/roles/install_yajl/tasks/main.yml
index a7eb7961e..20fd958c8 100644
--- a/ansible/roles/install_yajl/tasks/main.yml
+++ b/ansible/roles/install_yajl/tasks/main.yml
@@ -23,11 +23,10 @@
     chdir: "{{ yajl_path }}"
 
 - name: "make yajl"
-  my_make:
+  make:
     chdir: "{{ yajl_path }}"
 
 - name: "make install yajl"
-  my_make:
+  make:
     chdir: "{{ yajl_path }}"
     target: install
-