diff options
| author | Matt Woodson <mwoodson@redhat.com> | 2015-02-19 09:42:28 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-19 09:42:28 -0500 |
| commit | eaeeb1ec8370c35c7010b9350d42e30e5e00dcc5 (patch) | |
| tree | 5412075aa6562a57ddcfa7e6c70a322264dab61b | |
| parent | 8120628e5a4f913e770851c1a3172126d79695fc (diff) | |
| download | openshift-eaeeb1ec8370c35c7010b9350d42e30e5e00dcc5.tar.gz openshift-eaeeb1ec8370c35c7010b9350d42e30e5e00dcc5.tar.bz2 openshift-eaeeb1ec8370c35c7010b9350d42e30e5e00dcc5.tar.xz openshift-eaeeb1ec8370c35c7010b9350d42e30e5e00dcc5.zip | |
more updates
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 1 | ||||
| -rw-r--r-- | roles/ansible_tower/tasks/main.yaml | 16 | ||||
| -rw-r--r-- | roles/timezone/tasks/main.yaml | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml index 33c331222..0318d7a98 100644 --- a/playbooks/aws/ansible-tower/config.yml +++ b/playbooks/aws/ansible-tower/config.yml @@ -17,6 +17,7 @@ - "vars.{{ oo_env }}.yml" roles: - ../../../roles/base_os + - ../../../roles/timezone - ../../../roles/ipv6_disable - ../../../roles/ansible_install - ../../../roles/ansible_tower diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml index ccdc5a486..8fe0634d2 100644 --- a/roles/ansible_tower/tasks/main.yaml +++ b/roles/ansible_tower/tasks/main.yaml @@ -15,14 +15,14 @@ get_url: url=http://releases.ansible.com/ansible-tower/setup/ansible-tower-setup-2.1.1.tar.gz dest=/opt/ force=yes -- name: extract Tower - unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no - -- name: copy tower_setup_conf.yml - copy: src=tower_setup_conf.yml dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644 - -- name: copy inventory - copy: src=inventory dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644 +#- name: extract Tower +# unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no +# +#- name: copy tower_setup_conf.yml +# copy: src=tower_setup_conf.yml dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644 +# +#- name: copy inventory +# copy: src=inventory dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644 - name: run the Tower installer command: chdir=/opt/ansible-tower-setup-2.1.1 creates=/etc/awx/settings.py ./setup.sh diff --git a/roles/timezone/tasks/main.yaml b/roles/timezone/tasks/main.yaml new file mode 100644 index 000000000..339b4e0b2 --- /dev/null +++ b/roles/timezone/tasks/main.yaml @@ -0,0 +1,4 @@ +--- +- name: Setup correct timezone + command: timedatectl set-timezone America/New_York + when: ansible_os_family == "RedHat" and ansible_lsb.major_release|int >= 7 |