Integrate Shipyard into Genesis Lifecycle

Integrate Shipyard in CI/CD Pipeline

- Add rabbitmq and etcd-rabbitmq
- Add Shipyard/Airflow
- Enable node port for Shipyard API and Airflow Web GUI
- Version pinning will be done at a later date

Change-Id: Ifecd12248a96c4ca70b5bc2f12c1d2c263e49c65

manifests/basic_ucp/armada.yaml.sub

@@ -431,6 +431,105 @@ data:
   dependencies:
     - helm-toolkit
 ---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: shipyard
+data:
+  chart_name: shipyard
+  release: shipyard
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    prod_environment: true
+    images:
+      airflow: ${AIRFLOW_IMAGE}
+      shipyard: ${SHIPYARD_IMAGE}
+      airflow_db_sync: ${AIRFLOW_IMAGE}
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      shipyard:
+        node_port: ${SHIPYARD_NODE_PORT}
+        enable_node_port: true
+      airflow:
+        web:
+          node_port: ${AIRFLOW_NODE_PORT}
+          enable_node_port: true
+  source:
+    type: git
+    location: ${SHIPYARD_CHART_REPO}
+    subpath: shipyard
+    reference: ${SHIPYARD_CHART_BRANCH}
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-etcd-rabbitmq
+data:
+  chart_name: ucp-etcd-rabbitmq
+  release: etcd-rabbitmq
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    pod:
+      replicas:
+        etcd: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: etcd
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-rabbitmq
+data:
+  chart_name: ucp-rabbitmq
+  release: rabbitmq
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    pod:
+      replicas:
+        server: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: rabbitmq
+  dependencies:
+    - helm-toolkit
+---
 schema: armada/Manifest/v1
 metadata:
   schema: metadata/Document/v1
@@ -463,6 +562,8 @@ data:
     - ucp-mariadb
     - ucp-memcached
     - maas-postgresql
+    - ucp-etcd-rabbitmq
+    - ucp-rabbitmq
 ---
 schema: armada/ChartGroup/v1
 metadata:
@@ -474,6 +575,7 @@ data:
     - maas
     - drydock
     - deckhand
+    - shipyard
     - ucp-keystone
     - ucp-barbican
 ...

manifests/basic_ucp/deploy_ucp.sh

@@ -25,6 +25,8 @@ export MASTER_NODE_IP=${MASTER_NODE_IP:-"NA"}
 export NODE_NET_IFACE=${NODE_NET_IFACE:-"eth0"}
 export PROXY_ADDRESS=${PROXY_ADDRESS:-"http://one.proxy.att.com:8080"}
 export PROXY_ENABLED=${PROXY_ENABLED:-"false"}
+export AIRFLOW_NODE_PORT=${AIRFLOW_NODE_PORT:-32080}
+export SHIPYARD_NODE_PORT=${SHIPYARD_NODE_PORT:-31901}
 
 # Storage
 export CEPH_OSD_DIR=${CEPH_OSD_DIR:-"/var/lib/openstack-helm/ceph/osd"}
@@ -42,12 +44,16 @@ export MAAS_CHART_REPO=${MAAS_CHART_REPO:-"https://github.com/openstack/openstac
 export MAAS_CHART_BRANCH=${MAAS_CHART_BRANCH:-"master"}
 export DECKHAND_CHART_REPO=${DECKHAND_CHART_REPO:-"https://github.com/att-comdev/aic-helm"}
 export DECKHAND_CHART_BRANCH=${DECKHAND_CHART_BRANCH:-"master"}
+export SHIPYARD_CHART_REPO=${SHIPYARD_CHART_REPO:-"https://github.com/att-comdev/aic-helm"}
+export SHIPYARD_CHART_BRANCH=${SHIPYARD_CHART_BRANCH:-"master"}
 
 # Images
 export DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:0.2.0-a1"}
 export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:v0.6.0"}
 export PROMENADE_IMAGE=${PROMENADE_IMAGE:-"quay.io/attcomdev/promenade:master"}
 export DECKHAND_IMAGE=${DECKHAND_IMAGE:-"quay.io/attcomdev/deckhand:master"}
+export SHIPYARD_IMAGE=${SHIPYARD_IMAGE:-"quay.io/attcomdev/shipyard:master"}
+export AIRFLOW_IMAGE=${AIRFLOW_IMAGE:-"quay.io/attcomdev/airflow:master"}
 
 # Filenames
 export ARMADA_CONFIG=${ARMADA_CONFIG:-"armada.yaml"}
@@ -121,4 +127,18 @@ do
   sleep 5
 done
 
+# Check the status of deckhand-api pod
+# Ignore deckhand db or ks related pod
+while [[ -z $(kubectl get pods -n ucp | grep deckhand | grep -v db | grep -v ks | grep Running) ]]
+do
+  sleep 5
+done
+
+# Check the status of shipyard-api pod
+# Ignore shipyard db or ks related pod
+while [[ -z $(kubectl get pods -n ucp | grep shipyard | grep -v db | grep -v ks | grep Running) ]]
+do
+  sleep 5
+done
+
 echo 'UCP control plane deployed.'

manifests/basic_ucp/set-env.sh

@@ -13,6 +13,3 @@ export DRYDOCK_IMAGE=docker.io/sthussey/drydock:bonding-rc3
 export ARMADA_IMAGE=quay.io/attcomdev/armada:master
 export PROMENADE_IMAGE=quay.io/attcomdev/promenade:v0.2.0
 export CEPH_OSD_DIR=/var/lib/openstack-helm/ceph/osd
-export DECKHAND_IMAGE=quay.io/attcomdev/deckhand:latest
-export DECKHAND_CHART_REPO=https://github.com/att-comdev/aic-helm
-export DECKHAND_CHART_BRANCH=master