aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2019-10-04 15:28:34 -0400
committerAric Gardner <agardner@linuxfoundation.org>2019-10-04 15:29:32 -0400
commitf5025949a43415ae92b0885f3e61c43538f5c7b7 (patch)
tree8227ae1619a87935141ae4aea289bae3ea9ccc0f
parent3a61da9e2e522f938686ebdd78f6db1a0a0e24b3 (diff)
Rename Pharos to Laas
related to https://gerrit.opnfv.org/gerrit/c/laas/+/68576 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org> Change-Id: Ie5338260d6a13e557ef8fe00eda43269a17da3d6
-rw-r--r--INFO.yaml4
-rw-r--r--README10
-rwxr-xr-xinstall.sh6
-rw-r--r--laas/actions/add_booking.py (renamed from pharoslaas/actions/add_booking.py)0
-rw-r--r--laas/actions/add_booking.yaml (renamed from pharoslaas/actions/add_booking.yaml)0
-rw-r--r--laas/actions/apex_install.sh (renamed from pharoslaas/actions/apex_install.sh)0
-rw-r--r--laas/actions/apex_install.yaml (renamed from pharoslaas/actions/apex_install.yaml)0
-rw-r--r--laas/actions/apex_workflow.yaml (renamed from pharoslaas/actions/apex_workflow.yaml)0
-rw-r--r--laas/actions/clean-workflow.yaml (renamed from pharoslaas/actions/clean-workflow.yaml)0
-rw-r--r--laas/actions/compass_install.sh (renamed from pharoslaas/actions/compass_install.sh)0
-rw-r--r--laas/actions/compass_install.yaml (renamed from pharoslaas/actions/compass_install.yaml)0
-rw-r--r--laas/actions/compass_workflow.yaml (renamed from pharoslaas/actions/compass_workflow.yaml)0
-rw-r--r--laas/actions/deployment_workflow.yaml (renamed from pharoslaas/actions/deployment_workflow.yaml)2
-rw-r--r--laas/actions/fogAction.py (renamed from pharoslaas/actions/fogAction.py)0
-rw-r--r--laas/actions/fog_captureHost.py (renamed from pharoslaas/actions/fog_captureHost.py)0
-rw-r--r--laas/actions/fog_captureHost.yaml (renamed from pharoslaas/actions/fog_captureHost.yaml)0
-rw-r--r--laas/actions/fog_captureWorkflow.yaml (renamed from pharoslaas/actions/fog_captureWorkflow.yaml)0
-rw-r--r--laas/actions/fog_changeImage.py (renamed from pharoslaas/actions/fog_changeImage.py)0
-rw-r--r--laas/actions/fog_changeImage.yaml (renamed from pharoslaas/actions/fog_changeImage.yaml)0
-rw-r--r--laas/actions/fog_imageWorkflow.yaml (renamed from pharoslaas/actions/fog_imageWorkflow.yaml)0
-rw-r--r--laas/actions/fog_startImaging.py (renamed from pharoslaas/actions/fog_startImaging.py)0
-rw-r--r--laas/actions/fog_startImaging.yaml (renamed from pharoslaas/actions/fog_startImaging.yaml)0
-rw-r--r--laas/actions/fog_waitForCapture.py (renamed from pharoslaas/actions/fog_waitForCapture.py)0
-rw-r--r--laas/actions/fog_waitForCapture.yaml (renamed from pharoslaas/actions/fog_waitForCapture.yaml)0
-rw-r--r--laas/actions/fog_waitForImaging.py (renamed from pharoslaas/actions/fog_waitForImaging.py)0
-rw-r--r--laas/actions/fog_waitForImaging.yaml (renamed from pharoslaas/actions/fog_waitForImaging.yaml)0
-rw-r--r--laas/actions/fuel_horizon_nat.sh (renamed from pharoslaas/actions/fuel_horizon_nat.sh)0
-rw-r--r--laas/actions/fuel_horizon_nat.yaml (renamed from pharoslaas/actions/fuel_horizon_nat.yaml)0
-rw-r--r--laas/actions/fuel_install.sh (renamed from pharoslaas/actions/fuel_install.sh)0
-rw-r--r--laas/actions/fuel_install.yaml (renamed from pharoslaas/actions/fuel_install.yaml)0
-rw-r--r--laas/actions/fuel_workflow.yaml (renamed from pharoslaas/actions/fuel_workflow.yaml)0
-rw-r--r--laas/actions/genPass.sh (renamed from pharoslaas/actions/genPass.sh)0
-rw-r--r--laas/actions/genPass.yaml (renamed from pharoslaas/actions/genPass.yaml)0
-rw-r--r--laas/actions/joid_install.sh (renamed from pharoslaas/actions/joid_install.sh)0
-rw-r--r--laas/actions/joid_install.yaml (renamed from pharoslaas/actions/joid_install.yaml)0
-rw-r--r--laas/actions/joid_workflow.yaml (renamed from pharoslaas/actions/joid_workflow.yaml)0
-rw-r--r--laas/actions/password_workflow.yaml (renamed from pharoslaas/actions/password_workflow.yaml)0
-rw-r--r--laas/actions/restartHost.sh (renamed from pharoslaas/actions/restartHost.sh)0
-rw-r--r--laas/actions/restartHost.yaml (renamed from pharoslaas/actions/restartHost.yaml)0
-rw-r--r--laas/actions/setPass.sh (renamed from pharoslaas/actions/setPass.sh)0
-rw-r--r--laas/actions/setPass.yaml (renamed from pharoslaas/actions/setPass.yaml)0
-rw-r--r--laas/actions/update.sh (renamed from pharoslaas/actions/update.sh)0
-rw-r--r--laas/actions/update.yaml (renamed from pharoslaas/actions/update.yaml)0
-rw-r--r--laas/actions/update_workflow.yaml (renamed from pharoslaas/actions/update_workflow.yaml)0
-rw-r--r--laas/actions/vpnAction.py (renamed from pharoslaas/actions/vpnAction.py)0
-rw-r--r--laas/actions/vpn_delete_user.py (renamed from pharoslaas/actions/vpn_delete_user.py)0
-rw-r--r--laas/actions/vpn_delete_user.yaml (renamed from pharoslaas/actions/vpn_delete_user.yaml)0
-rw-r--r--laas/actions/vpn_make_user.py (renamed from pharoslaas/actions/vpn_make_user.py)0
-rw-r--r--laas/actions/vpn_make_user.yaml (renamed from pharoslaas/actions/vpn_make_user.yaml)0
-rw-r--r--laas/actions/waitForBoot.sh (renamed from pharoslaas/actions/waitForBoot.sh)0
-rw-r--r--laas/actions/waitForBoot.yaml (renamed from pharoslaas/actions/waitForBoot.yaml)0
-rw-r--r--laas/actions/workflows/apex_workflow.yaml (renamed from pharoslaas/actions/workflows/apex_workflow.yaml)2
-rw-r--r--laas/actions/workflows/clean-workflow.yaml (renamed from pharoslaas/actions/workflows/clean-workflow.yaml)4
-rw-r--r--laas/actions/workflows/compass_workflow.yaml (renamed from pharoslaas/actions/workflows/compass_workflow.yaml)0
-rw-r--r--laas/actions/workflows/deployment_workflow.yaml (renamed from pharoslaas/actions/workflows/deployment_workflow.yaml)16
-rw-r--r--laas/actions/workflows/fog_captureWorkflow.yaml (renamed from pharoslaas/actions/workflows/fog_captureWorkflow.yaml)8
-rw-r--r--laas/actions/workflows/fog_imageWorkflow.yaml (renamed from pharoslaas/actions/workflows/fog_imageWorkflow.yaml)10
-rw-r--r--laas/actions/workflows/fuel_workflow.yaml (renamed from pharoslaas/actions/workflows/fuel_workflow.yaml)2
-rw-r--r--laas/actions/workflows/joid_workflow.yaml (renamed from pharoslaas/actions/workflows/joid_workflow.yaml)2
-rw-r--r--laas/actions/workflows/password_workflow.yaml (renamed from pharoslaas/actions/workflows/password_workflow.yaml)4
-rw-r--r--laas/actions/workflows/update_workflow.yaml (renamed from pharoslaas/actions/workflows/update_workflow.yaml)6
-rw-r--r--laas/config.schema.yaml (renamed from pharoslaas/config.schema.yaml)0
-rw-r--r--laas/hosts.json22
-rw-r--r--laas/laas.yaml.example (renamed from pharoslaas/pharoslaas.yaml.example)0
-rw-r--r--laas/pack.yaml (renamed from pharoslaas/pack.yaml)2
-rw-r--r--laas/requirements.txt (renamed from pharoslaas/requirements.txt)0
-rw-r--r--laas/rules/clean.yaml (renamed from pharoslaas/rules/clean.yaml)6
-rw-r--r--laas/rules/deployment.yaml (renamed from pharoslaas/rules/deployment.yaml)6
-rw-r--r--laas/sensors/dashboard_listener.yaml (renamed from pharoslaas/sensors/dashboard_listener.yaml)4
-rwxr-xr-xlaas/sensors/laas.py (renamed from pharoslaas/sensors/pharos.py)32
-rw-r--r--pharoslaas/hosts.json22
-rwxr-xr-xsetup.sh4
-rwxr-xr-xupdate.sh2
73 files changed, 88 insertions, 88 deletions
diff --git a/INFO.yaml b/INFO.yaml
index a6c2342..79d1be0 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,6 +1,6 @@
---
-project: 'Lab as a Service - Reference Lab"
-project_creation_date: '2019.06.25'
+project: "Lab as a Service - Reference Lab"
+project_creation_date: "2019.06.25"
project_category: ''
lifecycle_state: 'Incubation'
project_lead: &opnfv_laas_ptl
diff --git a/README b/README
index a1a8d68..3795b88 100644
--- a/README
+++ b/README
@@ -19,10 +19,10 @@ do it yourself. This does not require much resources, and works well in a dedica
run:
./install.sh
- to install stackstorm and the pharos laas addon.
+ to install stackstorm and the laas addon.
Now there are two files you must fill out for configuration to be complete.
- edit /opt/stackstorm/configs/pharoslaas.yaml and /opt/stackstorm/packs/pharoslaas/hosts.json
+ edit /opt/stackstorm/configs/laas.yaml and /opt/stackstorm/packs/laas/hosts.json
according to the guide below. Once done, you can run
./setup.sh
to stand up and start the stackstorm service.
@@ -37,7 +37,7 @@ CONFIGURATION:
This is needed because the stackstorm exclusively stores strings.
Lets look at one host entry:
"name": "pod1", # This is an arbitrary name, must be in the "hosts" list
- "value": "{\"pharos_id\": 999, # this the resource id from the dashboard that corresponds to this host
+ "value": "{\"laas_id\": 999, # this the resource id from the dashboard that corresponds to this host
\"fog_name\": \"vm-1.1\", # this is the name FOG knows the host by
\"hostname\": \"pod1\", # hostname (or ip) that resolves to this host
\"ubuntu_image\": 17, # the FOG image ID for this host that has ubuntu installed
@@ -47,8 +47,8 @@ CONFIGURATION:
The name of each host ("pod1" in this case) must be in the list of hosts found at the bottom of the file.
The hosts list is what stackstorm uses to tell if you have been assigned a booking.
- pharoslaas.json:
- This is the configuration file for the pharoslaas pack. Looking at each line:
+ laas.json:
+ This is the configuration file for the laas pack. Looking at each line:
fog:
address: # the url of the fog server root
api_key: # the api key for FOG (fog configuration -> fog settings -> api system)
diff --git a/install.sh b/install.sh
index 8698f5d..c96c290 100755
--- a/install.sh
+++ b/install.sh
@@ -32,7 +32,7 @@ curl -sSL https://stackstorm.com/packages/install.sh | bash -s -- --user=st2admi
sed -i 's/user = stanley/user = root/' /etc/st2/st2.conf
sed -i 's/ssh_key_file = \/home\/stanley\/.ssh\/stanley_rsa/ssh_key_file = \/root\/.ssh\/id_rsa/' /etc/st2/st2.conf
-mv pharoslab/ /opt/stackstorm/packs/
-cp /opt/stackstorm/packs/pharoslab/pharoslab.yaml.example /opt/stackstorm/configs
+mv laaslab/ /opt/stackstorm/packs/
+cp /opt/stackstorm/packs/laaslab/laaslab.yaml.example /opt/stackstorm/configs
-echo "stackstorm should now be installed. Please edit /opt/stackstorm/configs/pharoslab.yaml and /opt/stackstorm/packs/pharoslab/hosts.json appropriately and run the setup script"
+echo "stackstorm should now be installed. Please edit /opt/stackstorm/configs/laaslab.yaml and /opt/stackstorm/packs/laaslab/hosts.json appropriately and run the setup script"
diff --git a/pharoslaas/actions/add_booking.py b/laas/actions/add_booking.py
index b34c23d..b34c23d 100644
--- a/pharoslaas/actions/add_booking.py
+++ b/laas/actions/add_booking.py
diff --git a/pharoslaas/actions/add_booking.yaml b/laas/actions/add_booking.yaml
index 0851599..0851599 100644
--- a/pharoslaas/actions/add_booking.yaml
+++ b/laas/actions/add_booking.yaml
diff --git a/pharoslaas/actions/apex_install.sh b/laas/actions/apex_install.sh
index f3ca83b..f3ca83b 100644
--- a/pharoslaas/actions/apex_install.sh
+++ b/laas/actions/apex_install.sh
diff --git a/pharoslaas/actions/apex_install.yaml b/laas/actions/apex_install.yaml
index 1956997..1956997 100644
--- a/pharoslaas/actions/apex_install.yaml
+++ b/laas/actions/apex_install.yaml
diff --git a/pharoslaas/actions/apex_workflow.yaml b/laas/actions/apex_workflow.yaml
index 43adf4a..43adf4a 100644
--- a/pharoslaas/actions/apex_workflow.yaml
+++ b/laas/actions/apex_workflow.yaml
diff --git a/pharoslaas/actions/clean-workflow.yaml b/laas/actions/clean-workflow.yaml
index cc93afb..cc93afb 100644
--- a/pharoslaas/actions/clean-workflow.yaml
+++ b/laas/actions/clean-workflow.yaml
diff --git a/pharoslaas/actions/compass_install.sh b/laas/actions/compass_install.sh
index 4d5d829..4d5d829 100644
--- a/pharoslaas/actions/compass_install.sh
+++ b/laas/actions/compass_install.sh
diff --git a/pharoslaas/actions/compass_install.yaml b/laas/actions/compass_install.yaml
index 9f88314..9f88314 100644
--- a/pharoslaas/actions/compass_install.yaml
+++ b/laas/actions/compass_install.yaml
diff --git a/pharoslaas/actions/compass_workflow.yaml b/laas/actions/compass_workflow.yaml
index 8e78372..8e78372 100644
--- a/pharoslaas/actions/compass_workflow.yaml
+++ b/laas/actions/compass_workflow.yaml
diff --git a/pharoslaas/actions/deployment_workflow.yaml b/laas/actions/deployment_workflow.yaml
index 659b7e2..83066d5 100644
--- a/pharoslaas/actions/deployment_workflow.yaml
+++ b/laas/actions/deployment_workflow.yaml
@@ -20,7 +20,7 @@ enabled: true
runner_type: mistral-v2
entry_point: workflows/deployment_workflow.yaml
name: deployment_workflow
-pack: pharoslaas
+pack: laas
parameters:
installer:
required: true
diff --git a/pharoslaas/actions/fogAction.py b/laas/actions/fogAction.py
index ef74939..ef74939 100644
--- a/pharoslaas/actions/fogAction.py
+++ b/laas/actions/fogAction.py
diff --git a/pharoslaas/actions/fog_captureHost.py b/laas/actions/fog_captureHost.py
index d8ee343..d8ee343 100644
--- a/pharoslaas/actions/fog_captureHost.py
+++ b/laas/actions/fog_captureHost.py
diff --git a/pharoslaas/actions/fog_captureHost.yaml b/laas/actions/fog_captureHost.yaml
index 3e38825..3e38825 100644
--- a/pharoslaas/actions/fog_captureHost.yaml
+++ b/laas/actions/fog_captureHost.yaml
diff --git a/pharoslaas/actions/fog_captureWorkflow.yaml b/laas/actions/fog_captureWorkflow.yaml
index a951d55..a951d55 100644
--- a/pharoslaas/actions/fog_captureWorkflow.yaml
+++ b/laas/actions/fog_captureWorkflow.yaml
diff --git a/pharoslaas/actions/fog_changeImage.py b/laas/actions/fog_changeImage.py
index 3586a75..3586a75 100644
--- a/pharoslaas/actions/fog_changeImage.py
+++ b/laas/actions/fog_changeImage.py
diff --git a/pharoslaas/actions/fog_changeImage.yaml b/laas/actions/fog_changeImage.yaml
index 36deff9..36deff9 100644
--- a/pharoslaas/actions/fog_changeImage.yaml
+++ b/laas/actions/fog_changeImage.yaml
diff --git a/pharoslaas/actions/fog_imageWorkflow.yaml b/laas/actions/fog_imageWorkflow.yaml
index f8c4aef..f8c4aef 100644
--- a/pharoslaas/actions/fog_imageWorkflow.yaml
+++ b/laas/actions/fog_imageWorkflow.yaml
diff --git a/pharoslaas/actions/fog_startImaging.py b/laas/actions/fog_startImaging.py
index f775efe..f775efe 100644
--- a/pharoslaas/actions/fog_startImaging.py
+++ b/laas/actions/fog_startImaging.py
diff --git a/pharoslaas/actions/fog_startImaging.yaml b/laas/actions/fog_startImaging.yaml
index 2a24f4d..2a24f4d 100644
--- a/pharoslaas/actions/fog_startImaging.yaml
+++ b/laas/actions/fog_startImaging.yaml
diff --git a/pharoslaas/actions/fog_waitForCapture.py b/laas/actions/fog_waitForCapture.py
index 7f7c488..7f7c488 100644
--- a/pharoslaas/actions/fog_waitForCapture.py
+++ b/laas/actions/fog_waitForCapture.py
diff --git a/pharoslaas/actions/fog_waitForCapture.yaml b/laas/actions/fog_waitForCapture.yaml
index 2d0364e..2d0364e 100644
--- a/pharoslaas/actions/fog_waitForCapture.yaml
+++ b/laas/actions/fog_waitForCapture.yaml
diff --git a/pharoslaas/actions/fog_waitForImaging.py b/laas/actions/fog_waitForImaging.py
index ea73f8f..ea73f8f 100644
--- a/pharoslaas/actions/fog_waitForImaging.py
+++ b/laas/actions/fog_waitForImaging.py
diff --git a/pharoslaas/actions/fog_waitForImaging.yaml b/laas/actions/fog_waitForImaging.yaml
index 4be325c..4be325c 100644
--- a/pharoslaas/actions/fog_waitForImaging.yaml
+++ b/laas/actions/fog_waitForImaging.yaml
diff --git a/pharoslaas/actions/fuel_horizon_nat.sh b/laas/actions/fuel_horizon_nat.sh
index a58516d..a58516d 100644
--- a/pharoslaas/actions/fuel_horizon_nat.sh
+++ b/laas/actions/fuel_horizon_nat.sh
diff --git a/pharoslaas/actions/fuel_horizon_nat.yaml b/laas/actions/fuel_horizon_nat.yaml
index 15bc7d8..15bc7d8 100644
--- a/pharoslaas/actions/fuel_horizon_nat.yaml
+++ b/laas/actions/fuel_horizon_nat.yaml
diff --git a/pharoslaas/actions/fuel_install.sh b/laas/actions/fuel_install.sh
index b5913f1..b5913f1 100644
--- a/pharoslaas/actions/fuel_install.sh
+++ b/laas/actions/fuel_install.sh
diff --git a/pharoslaas/actions/fuel_install.yaml b/laas/actions/fuel_install.yaml
index 301ac77..301ac77 100644
--- a/pharoslaas/actions/fuel_install.yaml
+++ b/laas/actions/fuel_install.yaml
diff --git a/pharoslaas/actions/fuel_workflow.yaml b/laas/actions/fuel_workflow.yaml
index 6975054..6975054 100644
--- a/pharoslaas/actions/fuel_workflow.yaml
+++ b/laas/actions/fuel_workflow.yaml
diff --git a/pharoslaas/actions/genPass.sh b/laas/actions/genPass.sh
index 5eba059..5eba059 100644
--- a/pharoslaas/actions/genPass.sh
+++ b/laas/actions/genPass.sh
diff --git a/pharoslaas/actions/genPass.yaml b/laas/actions/genPass.yaml
index c56daa6..c56daa6 100644
--- a/pharoslaas/actions/genPass.yaml
+++ b/laas/actions/genPass.yaml
diff --git a/pharoslaas/actions/joid_install.sh b/laas/actions/joid_install.sh
index bab13e2..bab13e2 100644
--- a/pharoslaas/actions/joid_install.sh
+++ b/laas/actions/joid_install.sh
diff --git a/pharoslaas/actions/joid_install.yaml b/laas/actions/joid_install.yaml
index 8b26cb2..8b26cb2 100644
--- a/pharoslaas/actions/joid_install.yaml
+++ b/laas/actions/joid_install.yaml
diff --git a/pharoslaas/actions/joid_workflow.yaml b/laas/actions/joid_workflow.yaml
index 7273cf7..7273cf7 100644
--- a/pharoslaas/actions/joid_workflow.yaml
+++ b/laas/actions/joid_workflow.yaml
diff --git a/pharoslaas/actions/password_workflow.yaml b/laas/actions/password_workflow.yaml
index 7798d64..7798d64 100644
--- a/pharoslaas/actions/password_workflow.yaml
+++ b/laas/actions/password_workflow.yaml
diff --git a/pharoslaas/actions/restartHost.sh b/laas/actions/restartHost.sh
index b6842d1..b6842d1 100644
--- a/pharoslaas/actions/restartHost.sh
+++ b/laas/actions/restartHost.sh
diff --git a/pharoslaas/actions/restartHost.yaml b/laas/actions/restartHost.yaml
index f274caf..f274caf 100644
--- a/pharoslaas/actions/restartHost.yaml
+++ b/laas/actions/restartHost.yaml
diff --git a/pharoslaas/actions/setPass.sh b/laas/actions/setPass.sh
index 8b1ddfc..8b1ddfc 100644
--- a/pharoslaas/actions/setPass.sh
+++ b/laas/actions/setPass.sh
diff --git a/pharoslaas/actions/setPass.yaml b/laas/actions/setPass.yaml
index 0c12cba..0c12cba 100644
--- a/pharoslaas/actions/setPass.yaml
+++ b/laas/actions/setPass.yaml
diff --git a/pharoslaas/actions/update.sh b/laas/actions/update.sh
index 6635864..6635864 100644
--- a/pharoslaas/actions/update.sh
+++ b/laas/actions/update.sh
diff --git a/pharoslaas/actions/update.yaml b/laas/actions/update.yaml
index 7c11a6d..7c11a6d 100644
--- a/pharoslaas/actions/update.yaml
+++ b/laas/actions/update.yaml
diff --git a/pharoslaas/actions/update_workflow.yaml b/laas/actions/update_workflow.yaml
index 27bbbba..27bbbba 100644
--- a/pharoslaas/actions/update_workflow.yaml
+++ b/laas/actions/update_workflow.yaml
diff --git a/pharoslaas/actions/vpnAction.py b/laas/actions/vpnAction.py
index 819ba13..819ba13 100644
--- a/pharoslaas/actions/vpnAction.py
+++ b/laas/actions/vpnAction.py
diff --git a/pharoslaas/actions/vpn_delete_user.py b/laas/actions/vpn_delete_user.py
index eac5f78..eac5f78 100644
--- a/pharoslaas/actions/vpn_delete_user.py
+++ b/laas/actions/vpn_delete_user.py
diff --git a/pharoslaas/actions/vpn_delete_user.yaml b/laas/actions/vpn_delete_user.yaml
index 4e06411..4e06411 100644
--- a/pharoslaas/actions/vpn_delete_user.yaml
+++ b/laas/actions/vpn_delete_user.yaml
diff --git a/pharoslaas/actions/vpn_make_user.py b/laas/actions/vpn_make_user.py
index 56cf9e6..56cf9e6 100644
--- a/pharoslaas/actions/vpn_make_user.py
+++ b/laas/actions/vpn_make_user.py
diff --git a/pharoslaas/actions/vpn_make_user.yaml b/laas/actions/vpn_make_user.yaml
index eb90956..eb90956 100644
--- a/pharoslaas/actions/vpn_make_user.yaml
+++ b/laas/actions/vpn_make_user.yaml
diff --git a/pharoslaas/actions/waitForBoot.sh b/laas/actions/waitForBoot.sh
index 399795e..399795e 100644
--- a/pharoslaas/actions/waitForBoot.sh
+++ b/laas/actions/waitForBoot.sh
diff --git a/pharoslaas/actions/waitForBoot.yaml b/laas/actions/waitForBoot.yaml
index 0700980..0700980 100644
--- a/pharoslaas/actions/waitForBoot.yaml
+++ b/laas/actions/waitForBoot.yaml
diff --git a/pharoslaas/actions/workflows/apex_workflow.yaml b/laas/actions/workflows/apex_workflow.yaml
index 17d842f..881fb8d 100644
--- a/pharoslaas/actions/workflows/apex_workflow.yaml
+++ b/laas/actions/workflows/apex_workflow.yaml
@@ -2,6 +2,6 @@
chain:
-
name: "apex_install"
- ref: "pharoslaas.apex_install"
+ ref: "laas.apex_install"
parameters:
hosts: "{{host}}"
diff --git a/pharoslaas/actions/workflows/clean-workflow.yaml b/laas/actions/workflows/clean-workflow.yaml
index c0a13e7..60fd40b 100644
--- a/pharoslaas/actions/workflows/clean-workflow.yaml
+++ b/laas/actions/workflows/clean-workflow.yaml
@@ -2,14 +2,14 @@
chain:
-
name: "image"
- ref: "pharoslaas.fog_imageWorkflow"
+ ref: "laas.fog_imageWorkflow"
parameters:
host: "{{host}}"
on-success: "delete_vpn_user"
-
name: "delete_vpn_user"
- ref: "pharoslaas.vpn_delete_user"
+ ref: "laas.vpn_delete_user"
parameters:
key: "{{key}}"
diff --git a/pharoslaas/actions/workflows/compass_workflow.yaml b/laas/actions/workflows/compass_workflow.yaml
index 6a03511..6a03511 100644
--- a/pharoslaas/actions/workflows/compass_workflow.yaml
+++ b/laas/actions/workflows/compass_workflow.yaml
diff --git a/pharoslaas/actions/workflows/deployment_workflow.yaml b/laas/actions/workflows/deployment_workflow.yaml
index c32d60d..35af6b7 100644
--- a/pharoslaas/actions/workflows/deployment_workflow.yaml
+++ b/laas/actions/workflows/deployment_workflow.yaml
@@ -1,6 +1,6 @@
---
version: '2.0'
-pharoslaas.deployment_workflow:
+laas.deployment_workflow:
description: The master workflow to provision, install, deploy hosts
input:
- host
@@ -10,7 +10,7 @@ pharoslaas.deployment_workflow:
- booking
tasks:
image_host:
- action: pharoslaas.fog_imageWorkflow host=<% $.host %> os=<% $.os %>
+ action: laas.fog_imageWorkflow host=<% $.host %> os=<% $.os %>
on-success:
- install_fuel: <% $.installer = 'Fuel' %>
- install_joid: <% $.installer = 'Joid' %>
@@ -19,29 +19,29 @@ pharoslaas.deployment_workflow:
- change_password: <% not $.installer in list('Fuel','Joid','Apex','Compass') %>
install_fuel:
- action: pharoslaas.fuel_workflow host=<% $.host %> scenario=<% $.scenario %>
+ action: laas.fuel_workflow host=<% $.host %> scenario=<% $.scenario %>
on-success:
- change_password
install_joid:
- action: pharoslaas.joid_workflow host=<% $.host %> scenario=<% $.scenario %>
+ action: laas.joid_workflow host=<% $.host %> scenario=<% $.scenario %>
on-success:
- change_password
install_apex:
- action: pharoslaas.apex_workflow host=<% $.host %> scenario=<% $.scenario %>
+ action: laas.apex_workflow host=<% $.host %> scenario=<% $.scenario %>
on-success:
- change_password
install_compass:
- action: pharoslaas.compass_workflow host=<% $.host %> scenario=<% $.scenario %>
+ action: laas.compass_workflow host=<% $.host %> scenario=<% $.scenario %>
on-success:
- change_password
change_password:
- action: pharoslaas.password_workflow host=<% $.host %>
+ action: laas.password_workflow host=<% $.host %>
on-success:
- make_vpn_user
make_vpn_user:
- action: pharoslaas.vpn_make_user booking=<% $.booking %>
+ action: laas.vpn_make_user booking=<% $.booking %>
diff --git a/pharoslaas/actions/workflows/fog_captureWorkflow.yaml b/laas/actions/workflows/fog_captureWorkflow.yaml
index 0f2fece..4641802 100644
--- a/pharoslaas/actions/workflows/fog_captureWorkflow.yaml
+++ b/laas/actions/workflows/fog_captureWorkflow.yaml
@@ -2,26 +2,26 @@
chain:
-
name: "startCapture"
- ref: "pharoslaas.fog_captureHost"
+ ref: "laas.fog_captureHost"
parameters:
host: "{{host}}"
on-success: "restartHost"
-
name: "restartHost"
- ref: "pharoslaas.restartHost"
+ ref: "laas.restartHost"
parameters:
host: "{{host}}"
on-success: "waitForCapture"
-
name: "waitForCapture"
- ref: "pharoslaas.fog_waitForCapture"
+ ref: "laas.fog_waitForCapture"
parameters:
host: "{{host}}"
on-success: "waitForBoot"
-
name: "waitForBoot"
- ref: pharoslaas.waitForBoot
+ ref: laas.waitForBoot
parameters:
host: "{{host}}"
timeout: 60
diff --git a/pharoslaas/actions/workflows/fog_imageWorkflow.yaml b/laas/actions/workflows/fog_imageWorkflow.yaml
index 52eff63..0f6e645 100644
--- a/pharoslaas/actions/workflows/fog_imageWorkflow.yaml
+++ b/laas/actions/workflows/fog_imageWorkflow.yaml
@@ -2,7 +2,7 @@
chain:
-
name: "changeImage"
- ref: "pharoslaas.fog_changeImage"
+ ref: "laas.fog_changeImage"
parameters:
image: "{{image}}"
host: "{{host}}"
@@ -11,21 +11,21 @@ chain:
-
name: "startImaging"
- ref: pharoslaas.fog_startImaging
+ ref: laas.fog_startImaging
parameters:
host: "{{host}}"
on-success: "restartHost"
-
name: "restartHost"
- ref: pharoslaas.restartHost
+ ref: laas.restartHost
parameters:
host: "{{host}}"
on-success: "waitForImaging"
-
name: "waitForImaging"
- ref: pharoslaas.fog_waitForImaging
+ ref: laas.fog_waitForImaging
parameters:
host: "{{host}}"
timeout: 180
@@ -33,7 +33,7 @@ chain:
-
name: "waitForBoot"
- ref: pharoslaas.waitForBoot
+ ref: laas.waitForBoot
parameters:
host: "{{host}}"
timeout: 60
diff --git a/pharoslaas/actions/workflows/fuel_workflow.yaml b/laas/actions/workflows/fuel_workflow.yaml
index f0d166c..9263a84 100644
--- a/pharoslaas/actions/workflows/fuel_workflow.yaml
+++ b/laas/actions/workflows/fuel_workflow.yaml
@@ -2,7 +2,7 @@
chain:
-
name: 'fuel_install'
- ref: 'pharoslaas.fuel_install'
+ ref: 'laas.fuel_install'
parameters:
hosts: "{{host}}"
timeout: 7200
diff --git a/pharoslaas/actions/workflows/joid_workflow.yaml b/laas/actions/workflows/joid_workflow.yaml
index 610832e..a0b98f8 100644
--- a/pharoslaas/actions/workflows/joid_workflow.yaml
+++ b/laas/actions/workflows/joid_workflow.yaml
@@ -3,7 +3,7 @@ chain:
-
name: "joid_install"
- ref: "pharoslaas.joid_install"
+ ref: "laas.joid_install"
parameters:
hosts: "{{host}}"
timeout: "{{timeout}}"
diff --git a/pharoslaas/actions/workflows/password_workflow.yaml b/laas/actions/workflows/password_workflow.yaml
index d400c53..8090941 100644
--- a/pharoslaas/actions/workflows/password_workflow.yaml
+++ b/laas/actions/workflows/password_workflow.yaml
@@ -3,14 +3,14 @@ chain:
-
name: genPasswd
- ref: pharoslaas.genPass
+ ref: laas.genPass
parameters:
key: "{{host}}-pass"
on-success: setPasswd
-
name: setPasswd
- ref: pharoslaas.setPass
+ ref: laas.setPass
parameters:
host: "{{host}}"
key: "{{host}}-pass"
diff --git a/pharoslaas/actions/workflows/update_workflow.yaml b/laas/actions/workflows/update_workflow.yaml
index 132266f..725f1ee 100644
--- a/pharoslaas/actions/workflows/update_workflow.yaml
+++ b/laas/actions/workflows/update_workflow.yaml
@@ -3,7 +3,7 @@ chain:
-
name: "imageHost"
- ref: "pharoslaas.fog_imageWorkflow"
+ ref: "laas.fog_imageWorkflow"
parameters:
image: "{{image}}"
os: "{{os}}"
@@ -12,13 +12,13 @@ chain:
-
name: "updateHost"
- ref: "pharoslaas.update"
+ ref: "laas.update"
parameters:
hosts: "{{host}}"
on-success: "captureHost"
-
name: "captureHost"
- ref: "pharoslaas.fog_captureWorkflow"
+ ref: "laas.fog_captureWorkflow"
parameters:
host: "{{host}}"
diff --git a/pharoslaas/config.schema.yaml b/laas/config.schema.yaml
index 309afe8..309afe8 100644
--- a/pharoslaas/config.schema.yaml
+++ b/laas/config.schema.yaml
diff --git a/laas/hosts.json b/laas/hosts.json
new file mode 100644
index 0000000..4a8c0c2
--- /dev/null
+++ b/laas/hosts.json
@@ -0,0 +1,22 @@
+[
+ {
+ "name": "pod1",
+ "value": "{\"laas_id\": 999, \"fog_name\": \"fog_host1\", \"hostname\": \"pod1\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
+ },
+ {
+ "name": "pod2",
+ "value": "{\"laas_id\": 998, \"fog_name\": \"fog_host2\", \"hostname\": \"pod2\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
+ },
+ {
+ "name": "pod3",
+ "value": "{\"laas_id\": 997, \"fog_name\": \"fog_name3\", \"hostname\": \"pod3\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
+ },
+ {
+ "name": "hosts",
+ "value" : "[\"pod1\", \"pod2\", \"pod3\"]"
+ },
+ {
+ "name": "bookings",
+ "value": "[]"
+ }
+]
diff --git a/pharoslaas/pharoslaas.yaml.example b/laas/laas.yaml.example
index 954e0d7..954e0d7 100644
--- a/pharoslaas/pharoslaas.yaml.example
+++ b/laas/laas.yaml.example
diff --git a/pharoslaas/pack.yaml b/laas/pack.yaml
index 7144a71..65862d8 100644
--- a/pharoslaas/pack.yaml
+++ b/laas/pack.yaml
@@ -15,7 +15,7 @@
# limitations under the License. #
##############################################################################
-name: pharoslaas
+name: laas
description: Provides all tools needed to host your own OPNFV lab
keywords:
- OPNFV
diff --git a/pharoslaas/requirements.txt b/laas/requirements.txt
index 697fe47..697fe47 100644
--- a/pharoslaas/requirements.txt
+++ b/laas/requirements.txt
diff --git a/pharoslaas/rules/clean.yaml b/laas/rules/clean.yaml
index f623ce6..e8655a0 100644
--- a/pharoslaas/rules/clean.yaml
+++ b/laas/rules/clean.yaml
@@ -16,13 +16,13 @@
##############################################################################
name: on_end_deployment_trigger
-pack: pharoslaas
+pack: laas
description: dummy rule to link end deployment trigger to clean action
enabled: true
trigger:
- type: pharoslaas.end_deployment_trigger
+ type: laas.end_deployment_trigger
action:
- ref: pharoslaas.clean-workflow
+ ref: laas.clean-workflow
parameters:
host: "{{ trigger.host }}"
key: "{{trigger.key}}"
diff --git a/pharoslaas/rules/deployment.yaml b/laas/rules/deployment.yaml
index 93942bf..211ca3e 100644
--- a/pharoslaas/rules/deployment.yaml
+++ b/laas/rules/deployment.yaml
@@ -16,13 +16,13 @@
##############################################################################
name: on_deployment_trigger
-pack: pharoslaas
+pack: laas
description: "rule to link deployment trigger to deployment action"
enabled: true
trigger:
- type: pharoslaas.start_deployment_trigger
+ type: laas.start_deployment_trigger
action:
- ref: pharoslaas.deployment_workflow
+ ref: laas.deployment_workflow
parameters:
installer: "{{ trigger.installer }}"
host: "{{ trigger.host }}"
diff --git a/pharoslaas/sensors/dashboard_listener.yaml b/laas/sensors/dashboard_listener.yaml
index 31c215f..b83d412 100644
--- a/pharoslaas/sensors/dashboard_listener.yaml
+++ b/laas/sensors/dashboard_listener.yaml
@@ -15,8 +15,8 @@
# limitations under the License. #
##############################################################################
-class_name: "Pharos_api"
-entry_point: "pharos.py"
+class_name: "Laas_api"
+entry_point: "lass.py"
description: "polls the dashboard api for deployments"
poll_interval: 30
trigger_types:
diff --git a/pharoslaas/sensors/pharos.py b/laas/sensors/laas.py
index a11160c..5d17fb2 100755
--- a/pharoslaas/sensors/pharos.py
+++ b/laas/sensors/laas.py
@@ -21,7 +21,7 @@ import json
from st2reactor.sensor.base import PollingSensor
-class Pharos_api(PollingSensor):
+class Laas_api(PollingSensor):
"""
This class listens to the dashboard and starts/stops bookings accordingly.
"""
@@ -61,15 +61,15 @@ class Pharos_api(PollingSensor):
def convertTimes(self, booking):
"""
- this method will take the time reported by Pharos in the
+ this method will take the time reported by Laas in the
format yyyy-mm-ddThh:mm:ssZ
and convert it into seconds since the epoch,
for easier management
"""
- booking['start'] = self.pharosToEpoch(booking['start'])
- booking['end'] = self.pharosToEpoch(booking['end'])
+ booking['start'] = self.laasToEpoch(booking['start'])
+ booking['end'] = self.laasToEpoch(booking['end'])
- def pharosToEpoch(self, timeStr):
+ def laasToEpoch(self, timeStr):
"""
Converts the dates from the dashboard to epoch time.
"""
@@ -103,11 +103,11 @@ class Pharos_api(PollingSensor):
The provisioning process gets spun up in a subproccess,
so the api listener is not interupted.
"""
- host = self.getServer(pharos_id=booking['resource_id'])['hostname']
+ host = self.getServer(laas_id=booking['resource_id'])['hostname']
self.log.info("Detected a new booking started for host %s", host)
self.setBookingStatus(booking['id'], 1) # mark booking started
# dispatch trigger into system
- trigger = "pharoslaas.start_deployment_trigger"
+ trigger = "laas.start_deployment_trigger"
payload = {"host": host, "installer": booking['installer_name']}
payload['scenario'] = booking['scenario_name']
payload['booking'] = booking['id']
@@ -117,13 +117,13 @@ class Pharos_api(PollingSensor):
"""
Resets a host once its booking has ended.
"""
- host = self.getServer(pharos_id=booking['resource_id'])['hostname']
+ host = self.getServer(laas_id=booking['resource_id'])['hostname']
self.log.info('Lease expired. Resetting host %s', host)
self.setBookingStatus(booking['id'], 3)
self.removeBooking(booking['id'])
# dispatch trigger to clean
- host = self.getServer(pharos_id=booking['resource_id'])['hostname']
- trigger = "pharoslaas.end_deployment_trigger"
+ host = self.getServer(laas_id=booking['resource_id'])['hostname']
+ trigger = "laas.end_deployment_trigger"
payload = {"host": host, "booking": booking['id']}
if 'vpn_key' in booking.keys():
payload['key'] = booking['vpn_key']
@@ -131,7 +131,7 @@ class Pharos_api(PollingSensor):
payload['key'] = ''
self.sensor_service.dispatch(trigger=trigger, payload=payload)
- def getServer(self, fog_name=None, hostname=None, pharos_id=None):
+ def getServer(self, fog_name=None, hostname=None, laas_id=None):
key = ""
value = ""
if fog_name is not None:
@@ -140,9 +140,9 @@ class Pharos_api(PollingSensor):
elif hostname is not None:
key = "hostname"
value = hostname
- elif pharos_id is not None:
- key = "pharos_id"
- value = pharos_id
+ elif laas_id is not None:
+ key = "laas_id"
+ value = laas_id
for server in self.servers:
if server[key] == value:
return server
@@ -192,7 +192,7 @@ class Pharos_api(PollingSensor):
)
self.resource_ids = []
for host in self.servers:
- self.resource_ids.append(host['pharos_id'])
+ self.resource_ids.append(host['laas_id'])
self.log = self.sensor_service.get_logger(name=self.__class__.__name__)
self.dashboard = self.sensor_service.get_value(
name='dashboard_url',
@@ -203,7 +203,7 @@ class Pharos_api(PollingSensor):
def poll(self):
"""
- this method will continuously poll the pharos dashboard.
+ this method will continuously poll the laas dashboard.
If a booking is found on our server,
we will start a deployment in the background with the
proper config file for the requested
diff --git a/pharoslaas/hosts.json b/pharoslaas/hosts.json
deleted file mode 100644
index a39616c..0000000
--- a/pharoslaas/hosts.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "name": "pod1",
- "value": "{\"pharos_id\": 999, \"fog_name\": \"fog_host1\", \"hostname\": \"pod1\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
- },
- {
- "name": "pod2",
- "value": "{\"pharos_id\": 998, \"fog_name\": \"fog_host2\", \"hostname\": \"pod2\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
- },
- {
- "name": "pod3",
- "value": "{\"pharos_id\": 997, \"fog_name\": \"fog_name3\", \"hostname\": \"pod3\", \"ubuntu_image\": 1, \"centos_image\": 2, \"suse_image\": 3}"
- },
- {
- "name": "hosts",
- "value" : "[\"pod1\", \"pod2\", \"pod3\"]"
- },
- {
- "name": "bookings",
- "value": "[]"
- }
-]
diff --git a/setup.sh b/setup.sh
index ee15655..e59ebd5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -17,5 +17,5 @@
st2ctl restart
st2ctl reload --register-all
-st2 run packs.setup_virtualenv packs=pharoslab
-st2 key load /opt/stackstorm/packs/pharoslab/hosts.json
+st2 run packs.setup_virtualenv packs=laaslab
+st2 key load /opt/stackstorm/packs/laaslab/hosts.json
diff --git a/update.sh b/update.sh
index 8fe78bb..fb031cc 100755
--- a/update.sh
+++ b/update.sh
@@ -16,6 +16,6 @@
##############################################################################
if git pull ; then
- rm -rf /opt/stackstorm/packs/pharoslaas/* && cp -r pharoslaas/ /opt/stackstorm/packs/
+ rm -rf /opt/stackstorm/packs/laas/* && cp -r laas/ /opt/stackstorm/packs/
st2ctl reload --register-all
fi