diff options
| author | Matt Woodson <mwoodson@redhat.com> | 2015-02-13 14:55:01 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-13 14:55:01 -0500 |
| commit | e45695622f867734cbfd64797cf6b830a2fff604 (patch) | |
| tree | 1f5c125021996e996ed5559eaf983e6128e30b0c /playbooks/aws | |
| parent | 2a8f7ab95107eb4ea353a8d42ecc19d1ebd32395 (diff) | |
| download | openshift-e45695622f867734cbfd64797cf6b830a2fff604.tar.gz openshift-e45695622f867734cbfd64797cf6b830a2fff604.tar.bz2 openshift-e45695622f867734cbfd64797cf6b830a2fff604.tar.xz openshift-e45695622f867734cbfd64797cf6b830a2fff604.zip | |
more ansible tower commits
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 5 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/launch.yml | 26 | ||||
| -rw-r--r-- | playbooks/aws/ansible-tower/vars.ops.yml (renamed from playbooks/aws/ansible-tower/vars.ops) | 0 |
3 files changed, 19 insertions, 12 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml index 0124156a9..069a7b7b1 100644 --- a/playbooks/aws/ansible-tower/config.yml +++ b/playbooks/aws/ansible-tower/config.yml @@ -16,5 +16,6 @@ - vars.yml - "vars.{{ oo_env }}.yml" roles: - - ../../../roles/atomic_base - - ../../../roles/atomic_proxy + - ../../../roles/base_os + - ../../../roles/ipv6_disable + - ../../../roles/ansible_install diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml index fd6b0f39a..b4b294a02 100644 --- a/playbooks/aws/ansible-tower/launch.yml +++ b/playbooks/aws/ansible-tower/launch.yml @@ -6,7 +6,7 @@ vars: inst_region: us-east-1 - atomic_ami: ami-8e239fe6 + 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 @@ -22,8 +22,8 @@ region: "{{ inst_region }}" keypair: mmcgrath_libra group_id: "{{ oo_security_group_ids }}" - instance_type: m3.large - image: "{{ atomic_ami }}" + instance_type: c4.xlarge + image: "{{ rhel7_ami }}" count: "{{ oo_new_inst_names | oo_len }}" user_data: "{{ lookup('file', user_data_file) }}" wait: yes @@ -42,8 +42,8 @@ region: "{{ inst_region }}" keypair: mmcgrath_libra group: ['Libra', '{{ oo_env }}', '{{ oo_env }}_proxy', '{{ oo_env }}_proxy_atomic'] - instance_type: m3.large - image: "{{ atomic_ami }}" + instance_type: c4.xlarge + image: "{{ rhel7_ami }}" count: "{{ oo_new_inst_names | oo_len }}" user_data: "{{ lookup('file', user_data_file) }}" wait: yes @@ -54,10 +54,6 @@ ec2: "{{ ec2_classic }}" when: not oo_vpc_subnet_id - - name: Add new instances public IPs to the atomic proxy host group - add_host: "hostname={{ item.public_ip }} groupname=new_ec2_instances" - with_items: ec2.instances - - name: Add Name and environment tags to instances ec2_tag: "resource={{ item.1.id }} region={{ inst_region }} state=present" with_together: @@ -93,5 +89,15 @@ delay: 10 with_items: ec2.instances +- name: Initial setup + hosts: oo_hosts_to_config + user: root + gather_facts: true + + tasks: + + - name: Yum update + yum: name=* state=latest + # Apply the configs, seprate so that just the configs can be run by themselves -- include: config.yml +#- include: config.yml diff --git a/playbooks/aws/ansible-tower/vars.ops b/playbooks/aws/ansible-tower/vars.ops.yml index feb5d786a..feb5d786a 100644 --- a/playbooks/aws/ansible-tower/vars.ops +++ b/playbooks/aws/ansible-tower/vars.ops.yml |