From b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Wed, 4 Mar 2015 17:45:02 -0500 Subject: rename base_os role to os_env_extras, move application to end since it just sets environment configs for root user --- playbooks/aws/ansible-tower/config.yml | 2 +- playbooks/aws/openshift-master/config.yml | 2 +- playbooks/aws/openshift-node/config.yml | 2 +- playbooks/gce/openshift-master/config.yml | 2 +- playbooks/gce/openshift-node/config.yml | 2 +- roles/base_os/files/irbrc | 2 -- roles/base_os/files/vimrc | 12 ------------ roles/base_os/tasks/main.yaml | 17 ----------------- roles/os_env_extras/files/irbrc | 2 ++ roles/os_env_extras/files/vimrc | 12 ++++++++++++ roles/os_env_extras/tasks/main.yaml | 17 +++++++++++++++++ 11 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 roles/base_os/files/irbrc delete mode 100644 roles/base_os/files/vimrc delete mode 100644 roles/base_os/tasks/main.yaml create mode 100644 roles/os_env_extras/files/irbrc create mode 100644 roles/os_env_extras/files/vimrc create mode 100644 roles/os_env_extras/tasks/main.yaml diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml index 30a27d0e0..efd1b9911 100644 --- a/playbooks/aws/ansible-tower/config.yml +++ b/playbooks/aws/ansible-tower/config.yml @@ -16,7 +16,7 @@ - vars.yml - "vars.{{ oo_env }}.yml" roles: - - base_os - os_ipv6_disable - ansible - ansible_tower + - os_env_extras diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index a8f7e25a5..c88828912 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -31,7 +31,6 @@ vars_files: - vars.yml roles: - - base_os - repos - { role: openshift_master, @@ -40,3 +39,4 @@ # TODO: openshift_public_ip: set to aws instance public ip } - pods + - os_env_extras diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml index f68041843..129464e1f 100644 --- a/playbooks/aws/openshift-node/config.yml +++ b/playbooks/aws/openshift-node/config.yml @@ -31,7 +31,6 @@ vars_files: - vars.yml roles: - - base_os - repos - docker - { @@ -41,3 +40,4 @@ openshift_env: "{{ oo_env }}" # TODO: openshift_public_ip: set to aws instance public ip } + - os_env_extras diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index 1c7dea3ca..7e754074b 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/playbooks/gce/openshift-master/config.yml @@ -31,7 +31,6 @@ vars_files: - vars.yml roles: - - base_os - repos - { role: openshift_master, @@ -40,3 +39,4 @@ openshift_env: "{{ oo_env }}", } - pods + - os_env_extras diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index adfad5d7e..85f34e814 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/playbooks/gce/openshift-node/config.yml @@ -37,7 +37,6 @@ vars_files: - vars.yml roles: - - base_os - repos - docker - { @@ -47,3 +46,4 @@ openshift_public_ip: "{{ gce_public_ip }}", openshift_env: "{{ oo_env }}", } + - os_env_extras diff --git a/roles/base_os/files/irbrc b/roles/base_os/files/irbrc deleted file mode 100644 index 47374e920..000000000 --- a/roles/base_os/files/irbrc +++ /dev/null @@ -1,2 +0,0 @@ -require 'irb/completion' -IRB.conf[:PROMPT_MODE] = :SIMPLE diff --git a/roles/base_os/files/vimrc b/roles/base_os/files/vimrc deleted file mode 100644 index 537b944ed..000000000 --- a/roles/base_os/files/vimrc +++ /dev/null @@ -1,12 +0,0 @@ -set tabstop=4 -set shiftwidth=4 -set expandtab -set list - -"flag problematic whitespace (trailing and spaces before tabs) -"Note you get the same by doing let c_space_errors=1 but -"this rule really applies to everything. -highlight RedundantSpaces term=standout ctermbg=red guibg=red -match RedundantSpaces /\s\+$\| \+\ze\t/ "\ze sets end of match so only spaces highlighted -"use :set list! to toggle visible whitespace on/off -set listchars=tab:>-,trail:.,extends:> diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml deleted file mode 100644 index aad611f70..000000000 --- a/roles/base_os/tasks/main.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# basic role, configures irbrc, vimrc - -- name: Ensure irbrc is installed for user root - copy: - src: irbrc - dest: /root/.irbrc - -- name: Ensure vimrc is installed for user root - copy: - src: vimrc - dest: /root/.vimrc - -- name: Bash Completion - yum: - pkg: bash-completion - state: installed diff --git a/roles/os_env_extras/files/irbrc b/roles/os_env_extras/files/irbrc new file mode 100644 index 000000000..47374e920 --- /dev/null +++ b/roles/os_env_extras/files/irbrc @@ -0,0 +1,2 @@ +require 'irb/completion' +IRB.conf[:PROMPT_MODE] = :SIMPLE diff --git a/roles/os_env_extras/files/vimrc b/roles/os_env_extras/files/vimrc new file mode 100644 index 000000000..537b944ed --- /dev/null +++ b/roles/os_env_extras/files/vimrc @@ -0,0 +1,12 @@ +set tabstop=4 +set shiftwidth=4 +set expandtab +set list + +"flag problematic whitespace (trailing and spaces before tabs) +"Note you get the same by doing let c_space_errors=1 but +"this rule really applies to everything. +highlight RedundantSpaces term=standout ctermbg=red guibg=red +match RedundantSpaces /\s\+$\| \+\ze\t/ "\ze sets end of match so only spaces highlighted +"use :set list! to toggle visible whitespace on/off +set listchars=tab:>-,trail:.,extends:> diff --git a/roles/os_env_extras/tasks/main.yaml b/roles/os_env_extras/tasks/main.yaml new file mode 100644 index 000000000..96b12ad5b --- /dev/null +++ b/roles/os_env_extras/tasks/main.yaml @@ -0,0 +1,17 @@ +--- +# environment configuration role, configures irbrc, vimrc + +- name: Ensure irbrc is installed for user root + copy: + src: irbrc + dest: /root/.irbrc + +- name: Ensure vimrc is installed for user root + copy: + src: vimrc + dest: /root/.vimrc + +- name: Bash Completion + yum: + pkg: bash-completion + state: installed -- cgit v1.2.3