diff --git a/action_plugins/add_host.py b/action_plugins/add_host.py deleted file mode 100644 index 5b3aed8120..0000000000 --- a/action_plugins/add_host.py +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2012, Seth Vidal -# -# This file is part of Ansible -# -# Ansible 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. -# -# Ansible 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 Ansible. If not, see . - -import ansible - -from ansible.callbacks import vv -from ansible.errors import AnsibleError as ae -from ansible.runner.return_data import ReturnData -from ansible.utils import parse_kv, template -from ansible.inventory.host import Host -from ansible.inventory.group import Group - -class ActionModule(object): - ''' Create inventory hosts and groups in the memory inventory''' - - ### We need to be able to modify the inventory - BYPASS_HOST_LOOP = True - - def __init__(self, runner): - self.runner = runner - - def run(self, conn, tmp, module_name, module_args, inject): - args = parse_kv(module_args) - if not 'hostname' in args: - raise ae("'hostname' is a required argument.") - - vv("created 'add_host' ActionModule: hostname=%s"%(args['hostname'])) - - - result = {'changed': True} - - new_host = Host(args['hostname']) - inventory = self.runner.inventory - - # add the new host to the 'all' group - allgroup = inventory.get_group('all') - allgroup.add_host(new_host) - result['changed'] = True - - # add it to the group if that was specified - if 'groupname' in args: - if not inventory.get_group(args['groupname']): - new_group = Group(args['groupname']) - inventory.add_group(new_group) - - ngobj = inventory.get_group(args['groupname']) - ngobj.add_host(new_host) - vv("created 'add_host' ActionModule: groupname=%s"%(args['groupname'])) - result['new_group'] = args['groupname'] - - result['new_host'] = args['hostname'] - - return ReturnData(conn=conn, comm_ok=True, result=result) - - - diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml index fa270fee6a..e3ad7a93e5 100644 --- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml @@ -116,22 +116,6 @@ tags: - provision_config - # note - kill this when ansible 0.9 comes out - - name: put ec2_create and add_host module into library path - action: copy src=$basedir/library/$item dest=/srv/copr-work/provision/library/$item - with_items: - - ec2_create - - add_host - tags: - - provision_config - - - name: put addhost into action_plugins path - action: copy src=$basedir/action_plugins/add_host.py dest=/srv/copr-work/provision/action_plugins/add_host.py - tags: - - provision_config - - # end kill this w/0.9 - - name: put ansible.cfg for all this into /etc/ansible/ on the system action: copy src=$files/copr/provision/ansible.cfg dest=/etc/ansible/ansible.cfg tags: diff --git a/tasks/persistent_cloud_nodisks.yml b/tasks/persistent_cloud_nodisks.yml index 1ee6740efd..3f15455a3d 100644 --- a/tasks/persistent_cloud_nodisks.yml +++ b/tasks/persistent_cloud_nodisks.yml @@ -5,7 +5,7 @@ ignore_errors: true - name: spin it up - local_action: ec2_create keypair=${keypair} image=${image} type=${instance_type} wait=true group=${security_group} + local_action: ec2 keypair=${keypair} image=${image} type=${instance_type} wait=true group=${security_group} ec2_access_key=$persist_access_key ec2_secret_key=$persist_secret_key ec2_url=$os_ec2_url register: inst_res only_if: "'${host_is_up.rc}' != '0'"