Merge pull request #19 from zonca/runthrough

Feedback testing on OpenStack Ubuntu deployment

ansible.cfg

@@ -1,8 +1,12 @@
 [defaults]
-remote_user=root
-become_user=root
+remote_user=ubuntu
 hostfile=./hosts
 library = ./ansible-conda
 
+[privilege_escalation]
+become=True
+become_method=sudo
+become_user=root
+
 [ssh_connection]
 ssh_args = -o ServerAliveInterval=60

deploy.yml

@@ -1,7 +1,20 @@
 ---
-
+
+# Make sure Python 2.7 is installed
+- hosts: jupyterhub_hosts
+  gather_facts: False
+  tasks:
+    - name: apt-get update
+      raw: apt-get update -qq
+    - name: Install python 2.7
+      raw: apt-get install -qq python2.7
+
+- hosts: jupyterhub_hosts
+  tasks:
+    - command: echo "$PATH"
+      register: default_path
+
 - hosts: jupyterhub_hosts
-  remote_user: root
   roles:
     - common
     - python
@@ -13,3 +26,5 @@
     - jupyterhub
     - { role: cull_idle, when: use_cull_idle_servers}
     - nbgrader
+  environment:
+      PATH: "/opt/conda/bin:{{ default_path.stdout }}"

docs/source/installation.rst

@@ -6,19 +6,21 @@ Prerequisites
 
 - Start a server running latest Ubuntu version.
 
-- Enable password-less SSH access for :command:`root` user.
+- Enable password-less SSH access for :command:`ubuntu` user.
 
 - Partition and format any local disks you want to mount.
 
-- Verify the server's hostname matches the fully qualified domain name (FQDN).
-
 - Verify a valid DNS entry for the server.
 
 - Choose an SSL certificate source. Use either of these options:
 
   * `Let's Encrypt <https://letsencrypt.org/>`_
   * obtain a trusted SSL certificate and key for the server at that FQDN.
 
+- Checkout the latest version of the repository including the ``ansible-conda`` submodule::
+
+    $ git clone --recursive https://github.com/jupyterhub/jupyterhub-deploy-teaching.git
+
 Create the hosts group
 ----------------------
 

host_vars/hostname.example

@@ -38,6 +38,8 @@ nbgrader_port: 5005
 # Create using something like `openssl rand -hex 32`
 formgrader_hubapi_token: ''
 
+# Path of the Python 2.7 interpreter on the remote server
+ansible_python_interpreter: '/usr/bin/python2.7'
 
 # ---------------------------------------------------
 # Optional

roles/nginx/templates/nginx.conf.j2

@@ -53,7 +53,7 @@ http {
 
 {% if nginx_public_html %}
         location ~ ^/public_html/([a-zA-Z0-9\-_%]*)(/.*)?$ {
-            alias /nbhome/$1/public_html$2;
+            alias {{ home_dir }}/$1/public_html$2;
             index  index.html index.htm Index.html;
             autoindex on;
         }