summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@emc.com>2016-01-19 20:58:35 -0500
committerMark Beierl <mark.beierl@emc.com>2016-01-29 18:54:44 +0000
commitc5f233d3ab0818d8dd598d835742db2ec4c3a890 (patch)
tree295ea3f6df99884675ba8f21c207bf892f0170bd /ci
parenta8e5c72b09f829b729515d24ec2a553fa330155a (diff)
Remote slave agent workload
Add storperf master object to manage stack lifecycle. Add configuration db. Creation of CLI vs. main so that ReST API and CLI API can be kept clear. Fixed License in files. Changed DB objects to be thread safe. Added ssh server to container if desired for CLI. Change-Id: Idfe84bfb7920e6ce19d27462593c21ea86e7b406 JIRA: STORPERF-29 Signed-off-by: Mark Beierl <mark.beierl@emc.com> (cherry picked from commit 488a47d945d3ef3dfa9ee37ca0aac3b480ffc800)
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh1
-rwxr-xr-xci/setup.py10
-rw-r--r--ci/storperf-master.yaml117
-rwxr-xr-xci/test.sh1
4 files changed, 10 insertions, 119 deletions
diff --git a/ci/build.sh b/ci/build.sh
deleted file mode 100755
index 8b13789..0000000
--- a/ci/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ci/setup.py b/ci/setup.py
index c8d05e8..daacc61 100755
--- a/ci/setup.py
+++ b/ci/setup.py
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2015 EMC and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
from setuptools import setup, find_packages
@@ -16,6 +25,7 @@ setup(
"flake8>=2.5.1",
"flask>=0.10.1",
"flask-restful>=0.3.5",
+ "html2text>=2016.1.8",
"mock>=1.3",
"pyyaml>=3.11",
"python-cinderclient>=1.5.0",
diff --git a/ci/storperf-master.yaml b/ci/storperf-master.yaml
deleted file mode 100644
index 1bc84f5..0000000
--- a/ci/storperf-master.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
- flavor:
- type: string
- default: m1.small
- image:
- type: string
- default: ubuntu-server
- key_name:
- type: string
- public_net_id:
- type: string
- default: public
- username:
- type: string
- default: storperf
-
-resources:
- storperf_manager:
- type: "OS::Nova::Server"
- properties:
- name: storperf-manager
- image: { get_param: image }
- flavor: { get_param: flavor }
- key_name: { get_param: key_name }
- networks:
- - port: { get_resource: storperf_manager_port }
- user_data: { get_resource: storperf_manager_config }
- user_data_format: RAW
-
- storperf_manager_config:
- type: "OS::Heat::CloudConfig"
- properties:
- cloud_config:
- users:
- - name: { get_param: username }
- groups: users
- shell: /bin/bash
- sudo: "ALL=(ALL) NOPASSWD:ALL"
- ssh_authorized_keys:
- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEbnDiqZ8RjQJJzJPf074J41XlYED+zYBzaUZ5UkkUquXzymyUmoWaFBXJP+XPu4Ns44U/S8614+JxGk96tjUdJlIjL0Ag8HP6KLtTNCabucKcEASpgJIVWqJvE3E9upZLIEiTGsF8I8S67T2qq1J1uvtxyeZmyjm7NMamjyFXE53dhR2EHqSutyKK1CK74NkRY9wr3qWUIt35kLdKSVSfrr4gOOicDALbIRu77skHIvrjt+wK1VWphBdMg6ytuq5mIE6pjWAU3Gwl4aTxOU0z43ARzCLq8HVf8s/dKjYMj8plNqaIfceMbaEUqpNHv/xbvtGNG7N0aB/a4pkUQL07
- - default
- package_update: true
- package_upgrade: true
- packages:
- - fio
- - python
- - rsync
- - graphite-carbon
- - graphite-web
- - apache2
- - libapache2-mod-wsgi
- - curl
-
- storperf_manager_port:
- type: "OS::Neutron::Port"
- properties:
- network_id: { get_resource: storperf_agent_net }
- security_groups:
- - { get_resource: storperf_security_group }
-
- storperf_manager_ip:
- type: "OS::Neutron::FloatingIP"
- properties:
- floating_network_id: { get_param: public_net_id }
- port_id: { get_resource: storperf_manager_port }
-
- storperf_agent_net:
- type: "OS::Neutron::Net"
- properties:
- name: storperf-agent-network
-
- storperf_agent_subnet:
- type: "OS::Neutron::Subnet"
- properties:
- name: StorPerf-Agent-Subnet
- network_id: { get_resource: storperf_agent_net }
- cidr: 192.168.101.0/24
- gateway_ip: 192.168.101.1
- enable_dhcp: true
- allocation_pools:
- - start: "192.168.101.2"
- end: "192.168.101.250"
-
- storperf_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- description: Neutron security group rules
- name: storperf_security_group
- rules:
- - remote_ip_prefix: 0.0.0.0/0
- protocol: tcp
- direction: ingress
- - remote_ip_prefix: 0.0.0.0/0
- protocol: icmp
- direction: ingress
-
- router:
- type: OS::Neutron::Router
-
- router_gateway:
- type: OS::Neutron::RouterGateway
- properties:
- router_id: { get_resource: router }
- network_id: { get_param: public_net_id }
-
- router_interface:
- type: OS::Neutron::RouterInterface
- properties:
- router_id: { get_resource: router }
- subnet_id: { get_resource: storperf_agent_subnet }
-
-outputs:
- public_ip:
- description: Floating IP address in public network
- value: { get_attr: [ storperf_manager_ip, floating_ip_address ] }
diff --git a/ci/test.sh b/ci/test.sh
deleted file mode 100755
index ff23c1e..0000000
--- a/ci/test.sh
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH="`pwd`/storperf":"`pwd`/tests" nosetests --with-xunit .