diff options
| -rw-r--r-- | README_AWS.md | 2 | ||||
| -rw-r--r-- | roles/ansible_tower/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/README.md | 50 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/meta/main.yml | 9 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/ansible_tower_cli/vars/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_ansible_inventory/tasks/main.yml | 14 |
9 files changed, 83 insertions, 3 deletions
diff --git a/README_AWS.md b/README_AWS.md index 888abe939..dc93357ee 100644 --- a/README_AWS.md +++ b/README_AWS.md @@ -65,7 +65,7 @@ If needed, these values can be changed by setting environment variables on your - export ec2_ami='ami-307b3658' - export ec2_region='us-east-1' - export ec2_keypair='libra' -- export ec2_security_group='public' +- export ec2_security_groups="['public']" - export os_master_root_vol_size='20' - export os_master_root_vol_type='standard' - export os_node_root_vol_size='15' diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml index 1d75a95e6..a85ce7dcc 100644 --- a/roles/ansible_tower/tasks/main.yaml +++ b/roles/ansible_tower/tasks/main.yaml @@ -9,7 +9,6 @@ - ansible - telnet - ack - - python-ansible-tower-cli - name: download Tower setup get_url: url=http://releases.ansible.com/ansible-tower/setup/ansible-tower-setup-2.1.1.tar.gz dest=/opt/ force=no @@ -31,4 +30,3 @@ - name: Set (httpd_can_network_connect_db) flag on and keep it persistent across reboots seboolean: name=httpd_can_network_connect_db state=yes persistent=yes - diff --git a/roles/ansible_tower_cli/README.md b/roles/ansible_tower_cli/README.md new file mode 100644 index 000000000..d2d68146f --- /dev/null +++ b/roles/ansible_tower_cli/README.md @@ -0,0 +1,50 @@ +ansible_tower_cli +============== + +Install ansible-tower-cli rpm. + +Requirements +------------ + +None + +Role Variables +-------------- + +None + +Dependencies +------------ + +None + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - roles/ansible_tower_cli + +License +------- + +Copyright 2012-2014 Red Hat, Inc., All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Author Information +------------------ + +openshift operations diff --git a/roles/ansible_tower_cli/defaults/main.yml b/roles/ansible_tower_cli/defaults/main.yml new file mode 100644 index 000000000..bef66bbfd --- /dev/null +++ b/roles/ansible_tower_cli/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for ansible_tower_cli diff --git a/roles/ansible_tower_cli/handlers/main.yml b/roles/ansible_tower_cli/handlers/main.yml new file mode 100644 index 000000000..0ce873648 --- /dev/null +++ b/roles/ansible_tower_cli/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ansible_tower_cli diff --git a/roles/ansible_tower_cli/meta/main.yml b/roles/ansible_tower_cli/meta/main.yml new file mode 100644 index 000000000..41dd23720 --- /dev/null +++ b/roles/ansible_tower_cli/meta/main.yml @@ -0,0 +1,9 @@ +--- +galaxy_info: + author: openshift operations name + description: install ansible-tower-cli + company: Red Hat, inc + license: ASL 2.0 + min_ansible_version: 1.2 +dependencies: [] + diff --git a/roles/ansible_tower_cli/tasks/main.yml b/roles/ansible_tower_cli/tasks/main.yml new file mode 100644 index 000000000..adf02ddc6 --- /dev/null +++ b/roles/ansible_tower_cli/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: Install python-ansible-tower-cli + yum: name=python-ansible-tower-cli diff --git a/roles/ansible_tower_cli/vars/main.yml b/roles/ansible_tower_cli/vars/main.yml new file mode 100644 index 000000000..a4c9abfb4 --- /dev/null +++ b/roles/ansible_tower_cli/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ansible_tower_cli diff --git a/roles/openshift_ansible_inventory/tasks/main.yml b/roles/openshift_ansible_inventory/tasks/main.yml index d68d27f84..dddfe24e3 100644 --- a/roles/openshift_ansible_inventory/tasks/main.yml +++ b/roles/openshift_ansible_inventory/tasks/main.yml @@ -29,3 +29,17 @@ backrefs: yes regexp: '^(hostfile|inventory)( *)=' line: '\1\2= /etc/ansible/inventory' + +- name: setting ec2.ini destination_format + lineinfile: + dest: /usr/share/ansible/inventory/aws/ec2.ini + regexp: '^destination_format *=' + line: "destination_format = {{ oo_ec2_destination_format }}" + when: oo_ec2_destination_format is defined + +- name: setting ec2.ini destination_format_tags + lineinfile: + dest: /usr/share/ansible/inventory/aws/ec2.ini + regexp: '^destination_format_tags *=' + line: "destination_format_tags = {{ oo_ec2_destination_format_tags }}" + when: oo_ec2_destination_format_tags is defined |