summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-05 19:58:21 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-05 19:58:21 +0000
commit3ba6befbd1a3d287753e24861075771616d5bb94 (patch)
tree5c2c8a441a07b700188ea354b2926bfe362684c2
parent39d347356fcb362d6f2fc8105e19990b511f1ab9 (diff)
downloadinfrastructure-3ba6befbd1a3d287753e24861075771616d5bb94.tar.gz
openid_provider: Fix deployment to production
-rw-r--r--baserock_openid_provider/baserock_openid_provider/settings.py4
-rw-r--r--baserock_openid_provider/packer_template.json16
2 files changed, 12 insertions, 8 deletions
diff --git a/baserock_openid_provider/baserock_openid_provider/settings.py b/baserock_openid_provider/baserock_openid_provider/settings.py
index 7f169bb3..3a704daf 100644
--- a/baserock_openid_provider/baserock_openid_provider/settings.py
+++ b/baserock_openid_provider/baserock_openid_provider/settings.py
@@ -62,10 +62,8 @@ WSGI_APPLICATION = 'baserock_openid_provider.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
- 'NAME': 'baserock_openid_provider',
+ 'NAME': 'openid_provider',
'USER': 'openid',
-
-
'PORT': '3306',
# You must change this to the correct IP address when
diff --git a/baserock_openid_provider/packer_template.json b/baserock_openid_provider/packer_template.json
index 3c6c8f6c..a5f40761 100644
--- a/baserock_openid_provider/packer_template.json
+++ b/baserock_openid_provider/packer_template.json
@@ -10,11 +10,11 @@
{
"name": "production",
"type": "openstack",
- "image_name": "openid.baserock.org",
- "flavor": 2,
+ "image_name": "baserock_openid_provider",
+ "flavor": "f0577618-9125-4948-b450-474e225bbc4c",
"source_image": "742e0414-c985-4994-b307-4aafade942b3",
"networks": ["d079fa3e-2558-4bcb-ad5a-279040c202b5"],
- "floating_ip": "85.199.252.132",
+ "floating_ip": "85.199.252.164",
"use_floating_ip": true,
"ssh_username": "fedora"
}
@@ -30,7 +30,13 @@
{
"type": "file",
"source": "database/baserock_openid_provider.database_password.yml",
- "destination": "/var/lib/baserock_openid_provider.database_password.yml"
+ "destination": "/var/tmp/baserock_openid_provider.database_password.yml"
+ },
+ {
+ "type": "shell",
+ "inline": [
+ "sudo mv /var/tmp/baserock_openid_provider.database_password.yml /var/lib"
+ ]
},
{
"type": "file",
@@ -57,7 +63,7 @@
{
"type": "shell",
"inline": [
- "sudo yum install libselinux-python",
+ "sudo yum install -y libselinux-python",
"sudo ansible localhost -m selinux -a state=disabled",
"sudo setenforce 0",
"sudo systemctl enable cherokee",