diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-12-18 11:56:10 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-01-22 13:12:58 +0000 |
commit | e71a84501df5b25933a69ba4ad798b6285060958 (patch) | |
tree | 61ab1cf8c41b210801a498a254fc0af5940e984e | |
parent | 4b358e2a50e9a6942344ce21328ac74765356e2b (diff) | |
download | infrastructure-e71a84501df5b25933a69ba4ad798b6285060958.tar.gz |
baserock_storyboard: Stop using puppet / packer for deployment
Change-Id: I04be3327312176282aa29cda47253a510d8dc43b
-rw-r--r-- | .gitmodules | 3 | ||||
-rwxr-xr-x | baserock_storyboard/develop.sh | 9 | ||||
-rw-r--r-- | baserock_storyboard/packer_template.json | 62 | ||||
m--------- | baserock_storyboard/puppet-storyboard | 0 | ||||
-rw-r--r-- | baserock_storyboard/site.pp | 46 |
5 files changed, 0 insertions, 120 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 0177e325..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "baserock_storyboard/puppet-storyboard"] - path = baserock_storyboard/puppet-storyboard - url = https://github.com/ssssam/puppet-storyboard diff --git a/baserock_storyboard/develop.sh b/baserock_storyboard/develop.sh deleted file mode 100755 index 79def875..00000000 --- a/baserock_storyboard/develop.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Set up a development environment in a container. - -exec docker run -i -t --rm \ - --publish=127.0.0.1:80:80 \ - --volume=`pwd`:/src/test-baserock-infrastructure \ - baserock/storyboard - diff --git a/baserock_storyboard/packer_template.json b/baserock_storyboard/packer_template.json deleted file mode 100644 index dc7cc95a..00000000 --- a/baserock_storyboard/packer_template.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "builders": [ - { - "name": "development", - "type": "docker", - "image": "fedora:20", - "commit": true, - "run_command": ["-d", "-i", "-t", "{{.Image}}", "/bin/sh"] - }, - { - "name": "production", - "type": "openstack", - "image_name": "baserock_storyboard", - "flavor": "f0577618-9125-4948-b450-474e225bbc4c", - "source_image": "742e0414-c985-4994-b307-4aafade942b3", - "networks": ["d079fa3e-2558-4bcb-ad5a-279040c202b5"], - "floating_ip": "85.199.252.159", - "use_floating_ip": true, - "ssh_username": "fedora" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "sudo yum install -y ruby gem", - "sudo gem install puppet" - ] - }, - { - "type": "shell", - "inline": [ - "sudo chown fedora:fedora /srv" - ], - "only": ["production"] - }, - { - "type": "file", - "source": "baserock_storyboard", - "destination": "/srv", - "only": ["production"] - }, - { "type": "shell", - "inline": [ - "cd /srv/baserock_storyboard", - "sudo /usr/local/bin/puppet module build puppet-storyboard", - "sudo /usr/local/bin/puppet module install puppet-storyboard/pkg/openstack-storyboard-*.*.*.tar.gz", - "sudo /usr/local/bin/puppet module install camptocamp-openssl" - ] - } - ], - "post-processors": [ - [ - { - "type": "docker-tag", - "repository": "baserock/storyboard", - "tag": "latest", - "only": ["development"] - } - ] - ] -} diff --git a/baserock_storyboard/puppet-storyboard b/baserock_storyboard/puppet-storyboard deleted file mode 160000 -Subproject cf3e84f0dfa52e57bc9892b1ee1147889b154e5 diff --git a/baserock_storyboard/site.pp b/baserock_storyboard/site.pp deleted file mode 100644 index 32323877..00000000 --- a/baserock_storyboard/site.pp +++ /dev/null @@ -1,46 +0,0 @@ -node default { - group { 'ssl-cert': - ensure => 'present' - } - - # This directory doesn't seem to exist by default in Fedora - file { '/etc/ssl/private': - ensure => directory - before => Class['storyboard::cert'] - } - - # TEMPORARY SSL private key - openssl::certificate::x509 { 'storyboard_dummy': - country => 'UK', - organization => 'The Baserock Project', - commonname => 'baserock.org', - base_dir => '/tmp/', - password => 'insecure', - before => Class['storyboard::cert'] - } - - class { 'storyboard::cert': - ssl_cert_file => '/tmp/storyboard_dummy.crt', - ssl_key_file => '/tmp/storyboard_dummy.key', - ssl_ca_file => '/etc/ssl/certs/ca-bundle.crt' - } - - # need class storyboard::rabbitmq too - - class { 'storyboard::application': - openid_url => 'https://openid.baserock.org/', - - mysql_host => '192.168.222.30', - mysql_database => 'storyboard', - mysql_user => 'storyboard', - # FIXME: need to read this from a file in /var/lib - mysql_user_password => 'storyboard_insecure', - - rabbitmq_host => 'localhost', - rabbitmq_port => 5672, - rabbitmq_vhost => '/', - rabbitmq_user => 'storyboard', - # FIXME: need to read this from a file in /var/lib - rabbitmq_user_password => 'storyboard_insecure' - } -} |