Merge pull request #433 from edx/jarv/add-hostname-to-common

Jarv/add hostname to common

playbooks/edx-east/deploy_common.yml

+- name: Deploy common
+  hosts: all
+  sudo: True
+  gather_facts: True
+  roles:
+    - gh_users
+    - common

playbooks/edx-east/edx_provision.yml

@@ -21,8 +21,8 @@
   sudo: True
   gather_facts: False
   roles:
+    # rerun common to set the hostname
+    - common
     # gh_users hash must be passed
     # in as a -e variable
     - gh_users
-    # use the default hostname
-    - hostname

playbooks/roles/common/defaults/main.yml

@@ -18,8 +18,8 @@ COMMON_ENV_TYPE: 'default_type'
 COMMON_PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
 # do not include http/https
 COMMON_GIT_MIRROR: 'github.com'
-
-
+# override this var to set a different hostname
+COMMON_HOSTNAME: !!null
 
 common_debian_pkgs:
   - ack-grep

playbooks/roles/common/tasks/main.yml

@@ -55,3 +55,18 @@
 - name: common | Install logrotate configuration for edX
   template: dest=/etc/logrotate.d/edx-services src=edx_logrotate.j2 owner=root group=root mode=644
 
+
+- name: common | update /etc/hosts
+  template: src=hosts.j2 dest=/etc/hosts
+  when: COMMON_HOSTNAME
+  register: etc_hosts
+
+- name: common | update /etc/hostname
+  template: src=hostname.j2 dest=/etc/hostname
+  when: COMMON_HOSTNAME
+  register: etc_hostname
+
+- name: common | run hostname
+  shell: >
+    hostname -F /etc/hostname
+  when: COMMON_HOSTNAME and (etc_hosts.changed or etc_hostname.changed)

playbooks/roles/common/templates/hostname.j2

+{{ COMMON_HOSTNAME }}

playbooks/roles/hostname/templates/hosts.j2 → playbooks/roles/common/templates/hosts.j2

-127.0.0.1 {{ hostname }} localhost
+127.0.0.1 {{ COMMON_HOSTNAME }} localhost
 
 # The following lines are desirable for IPv6 capable hosts
 ::1 ip6-localhost ip6-loopback

playbooks/roles/gh_users/defaults/main.yml

+# override this var to add a prefix to the prompt
+# also need to set commont_update_bashrc for to
+# update the system bashrc default
+GH_USERS_PROMPT: ""
+gh_users: []

playbooks/roles/gh_users/tasks/main.yml

@@ -12,9 +12,10 @@
 #      - mark
 
 
-- name: gh_users | checking for gh_users list
-  fail: msg="gh_users list must be defined for this parameterized role"
-  when: not gh_users
+- name: gh_users | creating default .bashrc
+  template: >
+    src=default.bashrc.j2 dest=/etc/skel/.bashrc
+    mode=0644 owner=root group=root
 
 - name: gh_users | create gh group
   group: name=gh state=present

playbooks/roles/gh_users/templates/default.bashrc.j2

+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='{{ GH_USERS_PROMPT }}${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='{{ GH_USERS_PROMPT}}${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# better bash history
+
+if [ "$BASH_VERSINFO" -ge 2 ]; then
+    shopt -s cdspell
+    shopt -s checkwinsize
+    shopt -s cmdhist
+    shopt -s histappend
+    shopt -s checkhash
+    shopt -s no_empty_cmd_completion
+    shopt -s execfail
+
+    HISTFILESIZE=10000
+    HISTDIR="$HOME/.bash_histories/`uname -n`"
+    [[ ! -d $HISTDIR ]] && mkdir -p "$HISTDIR"
+    HISTFILE="$HISTDIR/`date +%Y_%m`"
+    # Suppress duplicates, bare "ls" and bg,fg and exit
+    HISTIGNORE="&:ls:[bf]g:exit"
+fi
+
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+    . /etc/bash_completion
+fi

playbooks/roles/hostname/defaults/main.yml

----
-hostname: edx-server

playbooks/roles/hostname/tasks/main.yml

----
-# Simple role to change a hostname on an ubuntu server
-
-- name: hostname | update /etc/hosts
-  template: src=hosts.j2 dest=/etc/hosts
-  register: etc_hosts
-
-- name: hostname | update /etc/hostname
-  template: src=hostname.j2 dest=/etc/hostname
-  register: etc_hostname
-
-- name: hostname | run hostname
-  shell: >
-    hostname -F /etc/hostname
-  when: etc_hosts.changed or etc_hostname.changed
-
-

playbooks/roles/hostname/templates/hostname.j2

-{{ hostname }}

util/jenkins/ansible-provision.sh

@@ -94,6 +94,7 @@ gh_users:
   - ${github_username}
 dns_zone: $dns_zone
 rabbitmq_refresh: True
+GH_USERS_PROMPT: '[$name_tag] '
 EOF
     cat $extra_vars
     # run the tasks to launch an ec2 instance from AMI

util/jenkins/create-var-file.sh

@@ -28,4 +28,5 @@ ease_version: $ease_version
 
 rabbitmq_ip: "127.0.0.1"
 rabbitmq_refresh: True
+COMMON_HOSTNAME: edx-server
 EOF