diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 | 
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 | 
| commit | ada49b7eccf7fd96e5d4716ffd666987ad63be45 (patch) | |
| tree | 525deee94e5a7506dbea7ea3a6e866873dfba0dd /playbooks/aws/ansible-tower | |
| parent | 72f295fc7cdef47bffbdffa35b263e120ac9ad93 (diff) | |
| parent | 638aae76fe3e2ce367dbf5901169b509feb181df (diff) | |
| download | openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.gz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.bz2 openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.xz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.zip  | |
Merge pull request #1843 from detiber/remove_deprecated_roles
Remove deprecated roles
Diffstat (limited to 'playbooks/aws/ansible-tower')
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 24 | ||||
| l--------- | playbooks/aws/ansible-tower/filter_plugins | 1 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/launch.yml | 79 | ||||
| l--------- | playbooks/aws/ansible-tower/roles | 1 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/user_data.txt | 6 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/vars.ops.yml | 9 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/vars.yml | 1 | 
7 files changed, 0 insertions, 121 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml deleted file mode 100644 index eb3f1a1da..000000000 --- a/playbooks/aws/ansible-tower/config.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: "populate oo_hosts_to_config host group if needed" -  hosts: localhost -  gather_facts: no -  connection: local -  become: no -  tasks: -  - name: Evaluate oo_host_group_exp if it's set -    add_host: "name={{ item }} groups=oo_hosts_to_config" -    with_items: "{{ oo_host_group_exp | default(['']) }}" -    when: oo_host_group_exp is defined - -- name: "Configure instances" -  hosts: oo_hosts_to_config -  connection: ssh -  user: root -  vars_files: -    - vars.yml -    - "vars.{{ oo_env }}.yml" -  roles: -    - os_ipv6_disable -    - ansible -    - ansible_tower -    - os_env_extras diff --git a/playbooks/aws/ansible-tower/filter_plugins b/playbooks/aws/ansible-tower/filter_plugins deleted file mode 120000 index 99a95e4ca..000000000 --- a/playbooks/aws/ansible-tower/filter_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../filter_plugins
\ No newline at end of file diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml deleted file mode 100644 index d40529435..000000000 --- a/playbooks/aws/ansible-tower/launch.yml +++ /dev/null @@ -1,79 +0,0 @@ ---- -- name: Launch instance(s) -  hosts: localhost -  connection: local -  become: no -  gather_facts: no - -  vars: -    inst_region: us-east-1 -    rhel7_ami: ami-9101c8fa -    user_data_file: user_data.txt - -  vars_files: -    - vars.yml -    - "vars.{{ oo_env }}.yml" - -  tasks: -    - name: Launch instances in VPC -      ec2: -        state: present -        region: "{{ inst_region }}" -        keypair: mmcgrath_libra -        group_id: "{{ oo_security_group_ids }}" -        instance_type: c4.xlarge -        image: "{{ rhel7_ami }}" -        count: "{{ oo_new_inst_names | length }}" -        user_data: "{{ lookup('file', user_data_file) }}" -        wait: yes -        assign_public_ip: "{{ oo_assign_public_ip }}" -        vpc_subnet_id: "{{ oo_vpc_subnet_id }}" -      register: ec2 - -    - name: Add Name and environment tags to instances -      ec2_tag: "resource={{ item.1.id }} region={{ inst_region }} state=present" -      with_together: -        - oo_new_inst_names -        - ec2.instances -      args: -        tags: -          Name: "{{ item.0 }}" - -    - name: Add other tags to instances -      ec2_tag: "resource={{ item.id }} region={{ inst_region }} state=present" -      with_items: ec2.instances -      args: -        tags: "{{ oo_new_inst_tags }}" - -    - name: Add new instances public IPs to oo_hosts_to_config -      add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.public_ip }} groupname=oo_hosts_to_config" -      with_together: -        - oo_new_inst_names -        - ec2.instances - -    - debug: var=ec2 - -    - name: Wait for ssh -      wait_for: "port=22 host={{ item.public_ip }}" -      with_items: ec2.instances - -    - name: Wait for root user setup -      command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null root@{{ item.public_ip }} echo root user is setup" -      register: result -      until: result.rc == 0 -      retries: 20 -      delay: 10 -      with_items: ec2.instances - -- name: Initial setup -  hosts: oo_hosts_to_config -  user: root -  gather_facts: true - -  tasks: - -    - name: Update All Things -      action: "{{ ansible_pkg_mgr }} name=* state=latest" - -# Apply the configs, seprate so that just the configs can be run by themselves -- include: config.yml diff --git a/playbooks/aws/ansible-tower/roles b/playbooks/aws/ansible-tower/roles deleted file mode 120000 index 20c4c58cf..000000000 --- a/playbooks/aws/ansible-tower/roles +++ /dev/null @@ -1 +0,0 @@ -../../../roles
\ No newline at end of file diff --git a/playbooks/aws/ansible-tower/user_data.txt b/playbooks/aws/ansible-tower/user_data.txt deleted file mode 100644 index 643d17c32..000000000 --- a/playbooks/aws/ansible-tower/user_data.txt +++ /dev/null @@ -1,6 +0,0 @@ -#cloud-config -disable_root: 0 - -system_info: -  default_user: -    name: root diff --git a/playbooks/aws/ansible-tower/vars.ops.yml b/playbooks/aws/ansible-tower/vars.ops.yml deleted file mode 100644 index feb5d786a..000000000 --- a/playbooks/aws/ansible-tower/vars.ops.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -oo_env_long: operations -oo_zabbix_hostgroups: ['OPS Environment'] -oo_vpc_subnet_id: subnet-4f0bdd38  # USE OPS -oo_assign_public_ip: yes -oo_security_group_ids: -  - sg-02c2f267 # Libra (vpc) -  - sg-7fc4f41a # ops (vpc) -  - sg-4dc26829 # ops_tower (vpc) diff --git a/playbooks/aws/ansible-tower/vars.yml b/playbooks/aws/ansible-tower/vars.yml deleted file mode 100644 index ed97d539c..000000000 --- a/playbooks/aws/ansible-tower/vars.yml +++ /dev/null @@ -1 +0,0 @@ ----  | 
