diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-04 17:45:02 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-05 17:38:57 -0500 |
| commit | b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34 (patch) | |
| tree | b8f16225ad95f5692fca3d4c61c9f5f6235c732b | |
| parent | 7c90cacef0f5cf61fb8ac3adb905507dd4247d84 (diff) | |
| download | openshift-b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34.tar.gz openshift-b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34.tar.bz2 openshift-b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34.tar.xz openshift-b7008f070afe2629c9ebcbbdf0af3fa1f6ed9d34.zip | |
rename base_os role to os_env_extras, move application to end since it just sets environment configs for root user
| -rw-r--r-- | playbooks/aws/ansible-tower/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-node/config.yml | 2 | ||||
| -rw-r--r-- | roles/os_env_extras/files/irbrc (renamed from roles/base_os/files/irbrc) | 0 | ||||
| -rw-r--r-- | roles/os_env_extras/files/vimrc (renamed from roles/base_os/files/vimrc) | 0 | ||||
| -rw-r--r-- | roles/os_env_extras/tasks/main.yaml (renamed from roles/base_os/tasks/main.yaml) | 2 |
8 files changed, 6 insertions, 6 deletions
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/os_env_extras/files/irbrc index 47374e920..47374e920 100644 --- a/roles/base_os/files/irbrc +++ b/roles/os_env_extras/files/irbrc diff --git a/roles/base_os/files/vimrc b/roles/os_env_extras/files/vimrc index 537b944ed..537b944ed 100644 --- a/roles/base_os/files/vimrc +++ b/roles/os_env_extras/files/vimrc diff --git a/roles/base_os/tasks/main.yaml b/roles/os_env_extras/tasks/main.yaml index aad611f70..96b12ad5b 100644 --- a/roles/base_os/tasks/main.yaml +++ b/roles/os_env_extras/tasks/main.yaml @@ -1,5 +1,5 @@ --- -# basic role, configures irbrc, vimrc +# environment configuration role, configures irbrc, vimrc - name: Ensure irbrc is installed for user root copy: |