diff options
| author | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 12:55:41 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 12:55:41 -0500 |
| commit | 0a6602e6ff0e1340331002e371f5379ef74934a8 (patch) | |
| tree | 75291b077a2d8e0f6d38f64c3e53039b375e2272 /playbooks/aws | |
| parent | ff08486781625fcdd13210963b94e2c1d3a2e00a (diff) | |
| download | openshift-0a6602e6ff0e1340331002e371f5379ef74934a8.tar.gz openshift-0a6602e6ff0e1340331002e371f5379ef74934a8.tar.bz2 openshift-0a6602e6ff0e1340331002e371f5379ef74934a8.tar.xz openshift-0a6602e6ff0e1340331002e371f5379ef74934a8.zip | |
cleaned up ansible tower
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 5 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/launch.yml | 27 |
2 files changed, 3 insertions, 29 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml index 0318d7a98..423860828 100644 --- a/playbooks/aws/ansible-tower/config.yml +++ b/playbooks/aws/ansible-tower/config.yml @@ -17,7 +17,6 @@ - "vars.{{ oo_env }}.yml" roles: - ../../../roles/base_os - - ../../../roles/timezone - - ../../../roles/ipv6_disable - - ../../../roles/ansible_install + - ../../../roles/os_ipv6_disable + - ../../../roles/ansible - ../../../roles/ansible_tower diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml index d2938f443..4c29fa833 100644 --- a/playbooks/aws/ansible-tower/launch.yml +++ b/playbooks/aws/ansible-tower/launch.yml @@ -8,8 +8,6 @@ inst_region: us-east-1 rhel7_ami: ami-a24e30ca user_data_file: user_data.txt - oo_vpc_subnet_id: # Purposely left blank, these are here to be overridden in env vars_files - oo_assign_public_ip: # Purposely left blank, these are here to be overridden in env vars_files vars_files: - vars.yml @@ -29,30 +27,7 @@ wait: yes assign_public_ip: "{{ oo_assign_public_ip }}" vpc_subnet_id: "{{ oo_vpc_subnet_id }}" - when: oo_vpc_subnet_id - register: ec2_vpc - - - set_fact: - ec2: "{{ ec2_vpc }}" - when: oo_vpc_subnet_id - - - name: Launch instances in Classic - ec2: - state: present - region: "{{ inst_region }}" - keypair: mmcgrath_libra - group: ['Libra', '{{ oo_env }}', '{{ oo_env }}_proxy', '{{ oo_env }}_proxy_atomic'] - instance_type: c4.xlarge - image: "{{ rhel7_ami }}" - count: "{{ oo_new_inst_names | oo_len }}" - user_data: "{{ lookup('file', user_data_file) }}" - wait: yes - when: not oo_vpc_subnet_id - register: ec2_classic - - - set_fact: - ec2: "{{ ec2_classic }}" - when: not 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" |