summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--host_vars/aus-colo.linaro.org2
-rw-r--r--reservations.yml5
-rw-r--r--roles/colo-pxe/templates/customize_install.py4
-rw-r--r--roles/django/tasks/main.yml18
-rw-r--r--roles/publishing-deps/tasks/main.yml2
5 files changed, 17 insertions, 14 deletions
diff --git a/host_vars/aus-colo.linaro.org b/host_vars/aus-colo.linaro.org
index dc5c809..c0ea6fd 100644
--- a/host_vars/aus-colo.linaro.org
+++ b/host_vars/aus-colo.linaro.org
@@ -37,6 +37,8 @@ r1_hosts:
- mac: "00:01:73:02:01:7c"
name: r1-a4
ip: 10.10.0.104
+ pxe: true
+ tag: rack2
- mac: "00:01:73:02:0a:f1"
name: r1-a5
ip: 10.10.0.105
diff --git a/reservations.yml b/reservations.yml
index d0e6db4..5a73936 100644
--- a/reservations.yml
+++ b/reservations.yml
@@ -12,8 +12,9 @@ reservations:
- hosts: [r3-m1]
users: [andy.doan,clark.laughlin,yazen.ghannam,thomas.hanson,mahendra.ladhe]
- - hosts: [r2-a15, r2-a16, r2-a17, r2-a19, r2-a20]
- users: [fathi.boudra]
+ - hosts: [r2-a15, r2-a16, r2-a17, r2-a18, r2-a19, r2-a20]
+ users: [fathi.boudra, andy.doan]
+ tags: [ldap]
- hosts: [r2-a11, r2-a21, r2-a30]
users: [itaru.kitayama]
diff --git a/roles/colo-pxe/templates/customize_install.py b/roles/colo-pxe/templates/customize_install.py
index 2d6b0e5..e134e6a 100644
--- a/roles/colo-pxe/templates/customize_install.py
+++ b/roles/colo-pxe/templates/customize_install.py
@@ -37,7 +37,7 @@ for x in reservations:
if host in x['hosts']:
with open('/var/lib/misc/ssh_keys.json') as f:
keys = json.load(f)
- tags = x.get('tags', ['ldap'])
+ tags = x.get('tags', [])
for user in x['users']:
k = keys.get(user)
if k:
@@ -50,7 +50,7 @@ user = OS_TO_USER.get(os, 'admin')
print('Status: 200 OK')
print('Content-Type: text/plain; charset=UTF-8\n\n')
print('#!/bin/sh')
-print('exec >/home/%s/preseed.log 2>&1' % user)
+print('exec >/var/log/preseed.log')
print('set -x')
print('export PATH=$PATH:/usr/sbin')
print('cd /home/%s' % user)
diff --git a/roles/django/tasks/main.yml b/roles/django/tasks/main.yml
index 9d1830b..c1a6cdc 100644
--- a/roles/django/tasks/main.yml
+++ b/roles/django/tasks/main.yml
@@ -11,8 +11,8 @@
# Django's LTS release information can be found at:
# https://www.djangoproject.com/download/#supported-versions
-- name: Install Django via Pypi
- pip: name=Django version=1.8.12
+#- name: Install Django via Pypi
+# pip: name=Django version=1.8.12
- name: Create base directory for installation
file: path={{install_base}}/{{hostname}}
@@ -37,13 +37,13 @@
tags:
- update
-- name: Run DB migrate
- django_manage: app_path={{django_app_root}}
- settings={{django_settings}}
- command=migrate
- become_user: "{{apache_user}}"
- tags:
- - update
+#- name: Run DB migrate
+# django_manage: app_path={{django_app_root}}
+# settings={{django_settings}}
+# command=migrate
+# become_user: "{{apache_user}}"
+# tags:
+# - update
- name: Run collectstatic
django_manage: app_path={{django_app_root}}
diff --git a/roles/publishing-deps/tasks/main.yml b/roles/publishing-deps/tasks/main.yml
index 94d3abf..2b25211 100644
--- a/roles/publishing-deps/tasks/main.yml
+++ b/roles/publishing-deps/tasks/main.yml
@@ -6,7 +6,7 @@
- python-beautifulsoup
- python-boto
- python-django
- - python-django-openid-auth
+ - python-django-auth-openid
- python-pip # Only needed for the pip action below
- python-psycopg2
- python-requests