From fdde4e69846bda02e49c636fed991ba86318183d Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Thu, 14 Jul 2016 17:49:04 +0900 Subject: [PATCH] Revert "Condense amphora-agent-ubuntu in to amphora-agent" This reverts commit 687a972960915ef01008701dbbb35a7b52c728ae. Something about this seems to have possibly broken amphora boots. Testing reverting this patch to see if it fixes the scenario runs. Change-Id: I824cb1c6fa38f2320f84456a551585114215f625 --- elements/amphora-agent-ubuntu/README.rst | 3 +++ elements/amphora-agent-ubuntu/element-deps | 2 +- .../install.d/75-run_setup_install | 13 +++++++++++++ .../source-repository-amphora-agent | 2 ++ elements/amphora-agent-ubuntu/svc-map | 2 ++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 elements/amphora-agent-ubuntu/README.rst create mode 100755 elements/amphora-agent-ubuntu/install.d/75-run_setup_install create mode 100644 elements/amphora-agent-ubuntu/source-repository-amphora-agent create mode 100644 elements/amphora-agent-ubuntu/svc-map diff --git a/elements/amphora-agent-ubuntu/README.rst b/elements/amphora-agent-ubuntu/README.rst new file mode 100644 index 0000000000..2b6ca5f60d --- /dev/null +++ b/elements/amphora-agent-ubuntu/README.rst @@ -0,0 +1,3 @@ +Element to install an Octavia Amphora agent. + + diff --git a/elements/amphora-agent-ubuntu/element-deps b/elements/amphora-agent-ubuntu/element-deps index 6efeb1fe06..715c11e2f5 100644 --- a/elements/amphora-agent-ubuntu/element-deps +++ b/elements/amphora-agent-ubuntu/element-deps @@ -1 +1 @@ -amphora-agent +source-repositories diff --git a/elements/amphora-agent-ubuntu/install.d/75-run_setup_install b/elements/amphora-agent-ubuntu/install.d/75-run_setup_install new file mode 100755 index 0000000000..c02ab7dc57 --- /dev/null +++ b/elements/amphora-agent-ubuntu/install.d/75-run_setup_install @@ -0,0 +1,13 @@ +#!/bin/bash +set -eux + +install-packages libffi-dev libssl-dev +cd /opt/amphora-agent/ +pip install -r requirements.txt +python setup.py install +cp etc/init/amphora-agent.conf /etc/init/ +mkdir /etc/octavia +# we assume certs, etc will come in through the config drive +mkdir /etc/octavia/certs +mkdir /var/lib/octavia + diff --git a/elements/amphora-agent-ubuntu/source-repository-amphora-agent b/elements/amphora-agent-ubuntu/source-repository-amphora-agent new file mode 100644 index 0000000000..456d3f522a --- /dev/null +++ b/elements/amphora-agent-ubuntu/source-repository-amphora-agent @@ -0,0 +1,2 @@ +# This is temporary until we have a pip package +amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia diff --git a/elements/amphora-agent-ubuntu/svc-map b/elements/amphora-agent-ubuntu/svc-map new file mode 100644 index 0000000000..b850c874db --- /dev/null +++ b/elements/amphora-agent-ubuntu/svc-map @@ -0,0 +1,2 @@ +amphora-agent: + default: amphora-agent