Update templates to allow for paths

- Update templates to allow for chart paths - Update template to reflect some values.yaml changes in several charts - Update set-env.sh to reflect known working versions - Add some base assumption validations to deploy_ucp.sh Change-Id: Id914d7ff4678da9cb2cf5f7a53dc49114ea93f16
2017-10-30 16:32:36 -05:00 · 2017-10-30 16:32:36 -05:00 · 222599f123
parent 5835e84f8f
commit 222599f123
5 changed files with 661 additions and 41 deletions
--- a/manifests/basic_ucp/armada.yaml
+++ b/manifests/basic_ucp/armada.yaml
@ -0,0 +1,596 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: helm-toolkit
+data:
+  chart_name: helm-toolkit
+  release: helm-toolkit
+  namespace: helm-toolkit
+  timeout: 100
+  values: {}
+  source:
+    type: git
+    location: https://github.com/openstack/openstack-helm-infra
+    subpath: helm-toolkit
+    reference: master
+  dependencies: []
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ceph
+data:
+  chart_name: ceph
+  release: ceph
+  namespace: ceph
+  timeout: 3600
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - name: ceph-bootstrap
+          type: job
+          labels:
+            - application: ceph
+            - component: bootstrap
+            - release_group: armada-ucp
+        - name: ceph-mds-keyring-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: mds-keyring-generator
+            - release_group: armada-ucp
+        - name: ceph-mon-keyring-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: mon-keyring-generator
+            - release_group: armada-ucp
+        - name: ceph-rgw-keyring-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: rgw-keyring-generator
+            - release_group: armada-ucp
+        - name: ceph-storage-keys-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: storage-keys-generator
+            - release_group: armada-ucp
+        - name: ceph-osd-keyring-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: osd-keyring-generator
+            - release_group: armada-ucp
+  values:
+    labels:
+      jobs:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+    endpoints:
+      identity:
+        namespace: ucp
+      object_store:
+        namespace: ceph
+      ceph_mon:
+        namespace: ceph
+    ceph:
+      rgw_keystone_auth: true
+      storage:
+        osd_directory: /var/lib/openstack-helm/ceph/osd
+    network:
+      public: 172.24.1.0/24
+      cluster: 172.24.1.0/24
+    deployment:
+      storage_secrets: true
+      ceph: true
+      rbd_provisioner: true
+      client_secrets: false
+      rgw_keystone_user_and_endpoints: false
+    bootstrap:
+      enabled: true
+  source:
+    type: git
+    location: https://github.com/openstack/openstack-helm
+    subpath: ceph
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-ceph-config
+data:
+  chart_name: ucp-ceph-config
+  release: ucp-ceph-config
+  namespace: ucp
+  timeout: 3600
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - name: ceph-namespace-client-key-generator
+          type: job
+          labels:
+            - application: ceph
+            - component: namespace-client-key-generator
+            - release_group: armada-ucp
+  values:
+    labels:
+      jobs:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+    endpoints:
+      identity:
+        namespace: ucp
+      object_store:
+        namespace: ceph
+      ceph_mon:
+        namespace: ceph
+    ceph:
+      rgw_keystone_auth: true
+    network:
+      public: 172.24.1.0/24
+      cluster: 172.24.1.0/24
+    deployment:
+      storage_secrets: false
+      ceph: false
+      rbd_provisioner: false
+      client_secrets: true
+      rgw_keystone_user_and_endpoints: false
+  source:
+    type: git
+    location: https://github.com/openstack/openstack-helm
+    subpath: ceph
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-mariadb
+data:
+  chart_name: ucp-mariadb
+  release: ucp-mariadb
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    replicas:
+      server: 1
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: mariadb
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-memcached
+data:
+  chart_name: ucp-memcached
+  release: ucp-memcached
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: memcached
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-keystone
+data:
+  chart_name: ucp-keystone
+  release: keystone
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete:
+      - name: keystone-db-sync
+        type: job
+        labels:
+          - job-name: keystone-db-sync
+      - name: keystone-db-init
+        type: job
+        labels:
+          - job-name: keystone-db-init
+  post:
+    delete: []
+    create: []
+  values:
+    conf:
+      keystone:
+        override:
+      paste:
+        override:
+    replicas: 2
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: keystone
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: maas-postgresql
+data:
+  chart_name: maas-postgresql
+  release: maas-postgresql
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+    create: []
+  post:
+    delete: []
+    create: []
+  values:
+    development:
+      enabled: false
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: postgresql
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: maas
+data:
+  chart_name: maas
+  release: maas
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    bootdata_url: http://172.24.1.100:31000/api/v1.0/bootdata/
+    labels:
+      rack:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+      region:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+    network:
+      proxy:
+        node_port:
+          enabled: true
+          port: 31800
+      gui:
+        node_port:
+          enabled: true
+          port: 31900
+    conf:
+      maas:
+        credentials:
+          secret:
+            namespace: ucp
+        url:
+          maas_url: http://172.24.1.100:31900/MAAS
+        proxy:
+          proxy_enabled: 'false'
+          proxy_server: http://one.proxy.att.com:8080
+        ntp:
+          use_external_only: 'false'
+          ntp_servers: ntp.ubuntu.com
+        dns:
+          require_dnssec: 'no'
+          dns_servers: 8.8.8.8
+    secrets:
+      maas_region:
+        value: 3858a12230ac3c915f300c664f12063f
+  source:
+    type: git
+    location: https://github.com/att-comdev/maas
+    subpath: charts/maas
+    reference: refs/changes/79/384379/1
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: drydock
+data:
+  chart_name: drydock
+  release: drydock
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        drydock: docker.io/sthussey/drydock:384384v1
+        drydock_db_sync: docker.io/sthussey/drydock:384384v1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      drydock:
+        node_port:
+          enabled: true
+    endpoints:
+      physicalprovisioner:
+        port:
+          api:
+            nodeport: 31000
+    conf:
+      drydock:
+        maasdriver:
+          maas_api_url: http://172.24.1.100:31900/MAAS/api/2.0/
+  source:
+    type: git
+    location: https://github.com/att-comdev/drydock
+    subpath: charts/drydock
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: deckhand
+data:
+  chart_name: deckhand
+  release: deckhand
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      deckhand: quay.io/attcomdev/deckhand:master
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    conf:
+      deckhand:
+        DEFAULT:
+          debug: true
+          use_stderr: true
+          use_syslog: true
+  source:
+    type: git
+    location: https://github.com/att-comdev/deckhand
+    subpath: charts/deckhand
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-barbican
+data:
+  chart_name: ucp-barbican
+  release: barbican
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    images:
+      tags:
+        api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
+        db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
+        test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    pod:
+      replicas:
+        api: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: barbican
+  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: quay.io/attcomdev/airflow:master
+      shipyard: quay.io/attcomdev/shipyard:master
+      airflow_db_sync: quay.io/attcomdev/airflow:master
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      shipyard:
+        node_port: 31901
+        enable_node_port: true
+      airflow:
+        web:
+          node_port: 32080
+          enable_node_port: true
+    conf:
+      shipyard:
+        keystone_authtoken:
+          memcache_security_strategy: None
+  source:
+    type: git
+    location: https://github.com/att-comdev/shipyard
+    subpath: charts/shipyard
+    reference: master
+  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
+  name: ucp-basic
+data:
+  release_prefix: armada-ucp
+  chart_groups:
+    - ceph
+    - ucp-infra
+    - ucp-services
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ceph
+data:
+  description: 'Storage Backend'
+  sequenced: true
+  chart_group:
+    - ceph
+    - ucp-ceph-config
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-infra
+data:
+  description: 'UCP Infrastructure'
+  chart_group:
+    - ucp-mariadb
+    - ucp-memcached
+    - maas-postgresql
+    - ucp-etcd-rabbitmq
+    - ucp-rabbitmq
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-services
+data:
+  description: 'UCP Services'
+  chart_group:
+    - maas
+    - drydock
+    - deckhand
+    - shipyard
+    - ucp-keystone
+    - ucp-barbican
+...
--- a/manifests/basic_ucp/armada.yaml.sub
+++ b/manifests/basic_ucp/armada.yaml.sub
@ -11,9 +11,9 @@ data:
  values: {}
  source:
    type: git
-    location: https://git.openstack.org/openstack/openstack-helm
-    subpath: helm-toolkit
-    reference: master
+    location: ${HTK_CHART_REPO}
+    subpath: ${HTK_CHART_PATH}
+    reference: ${HTK_CHART_BRANCH}
  dependencies: []
 ---
 schema: armada/Chart/v1
@ -97,7 +97,7 @@ data:
  source:
    type: git
    location: ${CEPH_CHART_REPO}
-    subpath: ceph
+    subpath: ${CEPH_CHART_PATH}
    reference: ${CEPH_CHART_BRANCH}
  dependencies:
    - helm-toolkit
@ -149,7 +149,7 @@ data:
  source:
    type: git
    location: ${CEPH_CHART_REPO}
-    subpath: ceph
+    subpath: ${CEPH_CHART_PATH}
    reference: ${CEPH_CHART_BRANCH}
  dependencies:
    - helm-toolkit
@ -328,7 +328,7 @@ data:
  source:
    type: git
    location: ${MAAS_CHART_REPO}
-    subpath: maas
+    subpath: ${MAAS_CHART_PATH}
    reference: ${MAAS_CHART_BRANCH}
  dependencies:
    - helm-toolkit
@ -347,7 +347,9 @@ data:
    no_hooks: false
  values:
    images:
-      drydock: ${DRYDOCK_IMAGE}
+      tags:
+        drydock: ${DRYDOCK_IMAGE}
+        drydock_db_sync: ${DRYDOCK_IMAGE}
    labels:
      node_selector_key: ucp-control-plane
      node_selector_value: enabled
@ -356,15 +358,19 @@ data:
        node_port:
          enabled: true
          port: ${DRYDOCK_NODE_PORT}
+    endpoints:
+      physicalprovisioner:
+        port:
+          api:
+            nodeport: ${DRYDOCK_NODE_PORT}
    conf:
      drydock:
        maasdriver:
-          drydock_provisioner:
-            maas_api_url: http://${MAAS_NODE_IP}:${MAAS_NODE_PORT}/MAAS/api/2.0/
+          maas_api_url: http://${MAAS_NODE_IP}:${MAAS_NODE_PORT}/MAAS/api/2.0/
  source:
    type: git
    location: ${DRYDOCK_CHART_REPO}
-    subpath: drydock
+    subpath: ${DRYDOCK_CHART_PATH}
    reference: ${DRYDOCK_CHART_BRANCH}
  dependencies:
    - helm-toolkit
@ -383,7 +389,8 @@ data:
    no_hooks: false
  values:
    images:
-      deckhand: ${DECKHAND_IMAGE}
+      tags:
+        deckhand: ${DECKHAND_IMAGE}
    labels:
      node_selector_key: ucp-control-plane
      node_selector_value: enabled
@ -393,10 +400,12 @@ data:
          debug: true
          use_stderr: true
          use_syslog: true
+        keystone_authtoken:
+          memcache_security_strategy: None
  source:
    type: git
    location: ${DECKHAND_CHART_REPO}
-    subpath: deckhand
+    subpath: ${DECKHAND_CHART_PATH}
    reference: ${DECKHAND_CHART_BRANCH}
  dependencies:
    - helm-toolkit
@ -447,9 +456,10 @@ data:
  values:
    prod_environment: true
    images:
-      airflow: ${AIRFLOW_IMAGE}
-      shipyard: ${SHIPYARD_IMAGE}
-      airflow_db_sync: ${AIRFLOW_IMAGE}
+      tags:
+        airflow: ${AIRFLOW_IMAGE}
+        shipyard: ${SHIPYARD_IMAGE}
+        airflow_db_sync: ${AIRFLOW_IMAGE}
    labels:
      node_selector_key: ucp-control-plane
      node_selector_value: enabled
@ -464,13 +474,11 @@ data:
    conf:
      shipyard:
        keystone_authtoken:
-          keystonemiddleware:
-            auth_token:
-              memcache_security_strategy: None
+          memcache_security_strategy: None
  source:
    type: git
    location: ${SHIPYARD_CHART_REPO}
-    subpath: shipyard
+    subpath: ${SHIPYARD_CHART_PATH}
    reference: ${SHIPYARD_CHART_BRANCH}
  dependencies:
    - helm-toolkit
--- a/manifests/basic_ucp/deploy_ucp.sh
+++ b/manifests/basic_ucp/deploy_ucp.sh
@ -33,23 +33,33 @@ export CEPH_OSD_DIR=${CEPH_OSD_DIR:-"/var/lib/openstack-helm/ceph/osd"}

 # Hostnames
 export GENESIS_NODE_NAME=${GENESIS_NODE_NAME:-"node1"}
+export GENESIS_NODE_NAME=$(echo $GENESIS_NODE_NAME | tr [:upper:] [:lower:])
 export MASTER_NODE_NAME=${MASTER_NODE_NAME:-"node2"}
+export MASTER_NODE_NAME=$(echo $MASTER_NODE_NAME | tr [:upper:] [:lower:])

 # Charts
+export HTK_CHART_REPO=${HTK_CHART_REPO:-"https://github.com/openstack/openstack-helm"}
+export HTK_CHART_PATH=${HTK_CHART_PATH:-"helm-toolkit"}
+export HTK_CHART_BRANCH=${HTK_CHART_BRANCH:-"master"}
 export CEPH_CHART_REPO=${CEPH_CHART_REPO:-"https://github.com/openstack/openstack-helm"}
+export CEPH_CHART_PATH=${CEPH_CHART_PATH:-"ceph"}
 export CEPH_CHART_BRANCH=${CEPH_CHART_BRANCH:-"master"}
-export DRYDOCK_CHART_REPO=${DRYDOCK_CHART_REPO:-"https://github.com/att-comdev/aic-helm"}
+export DRYDOCK_CHART_REPO=${DRYDOCK_CHART_REPO:-"https://github.com/att-comdev/drydock"}
+export DRYDOCK_CHART_PATH=${DRYDOCK_CHART_PATH:-"charts/drydock"}
 export DRYDOCK_CHART_BRANCH=${DRYDOCK_CHART_BRANCH:-"master"}
-export MAAS_CHART_REPO=${MAAS_CHART_REPO:-"https://github.com/openstack/openstack-helm-addons"}
+export MAAS_CHART_REPO=${MAAS_CHART_REPO:-"https://github.com/att-comdev/maas"}
+export MAAS_CHART_PATH=${MAAS_CHART_PATH:-"charts/maas"}
 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_REPO=${DECKHAND_CHART_REPO:-"https://github.com/att-comdev/deckhand"}
+export DECKHAND_CHART_PATH=${DECKHAND_CHART_PATH:-"charts/deckhand"}
 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_REPO=${SHIPYARD_CHART_REPO:-"https://github.com/att-comdev/shipyard"}
+export SHIPYARD_CHART_PATH=${SHIPYARD_CHART_PATH:-"charts/shipyard"}
 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 DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:master"}
+export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:master"}
 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"}
@ -73,6 +83,18 @@ then
  exit -1
 fi

+if [[ $(hostname) != $GENESIS_NODE_NAME ]]
+then
+  echo "Local node hostname $(hostname) does not match GENESIS_NODE_NAME $GENESIS_NODE_NAME."
+  exit -1
+fi
+
+if [[ -z $(grep $GENESIS_NODE_NAME /etc/hosts | grep $GENESIS_NODE_IP) ]]
+then
+  echo "No /etc/hosts entry found for $GENESIS_NODE_NAME. Please add one."
+  exit -1
+fi
+
 if [[ $PROXY_ENABLED == 'true' ]]
 then
  export http_proxy=$PROXY_ADDRESS
--- a/manifests/basic_ucp/drydock.yaml.example
+++ b/manifests/basic_ucp/drydock.yaml.example
@ -197,13 +197,13 @@ spec:
  # Mapping of hardware alias/role to physical address
  device_aliases:
    # the device alias that will be referenced in HostProfile or BaremetalNode design parts
-  - alias: 'pnic01'
-    # The hardware bus the device resides on. Supports 'pci' and 'scsi'. No default
-    bus_type: 'pci'
-    # The type of device as reported by lshw. Can be used to validate hardware manifest. No default
-    dev_type: 'Intel 10Gbps NIC'
-    # Physical address on the bus
-    address: '0000:00:03.0'
+    pnic01:
+      # The hardware bus the device resides on. Supports 'pci' and 'scsi'. No default
+      bus_type: 'pci'
+      # The type of device as reported by lshw. Can be used to validate hardware manifest. No default
+      dev_type: 'Intel 10Gbps NIC'
+      # Physical address on the bus
+      address: '0000:00:03.0'
 ---
 apiVersion: 'drydock/v1'
 kind: HostProfile
--- a/manifests/basic_ucp/set-env.sh
+++ b/manifests/basic_ucp/set-env.sh
@ -4,12 +4,6 @@ export CEPH_PUBLIC_NET=172.24.1.0/24
 export GENESIS_NODE_IP=172.24.1.100
 export MASTER_NODE_IP=172.24.1.101
 export NODE_NET_IFACE=ens3
-export DRYDOCK_CHART_REPO=https://github.com/sh8121att/helm_charts
-export DRYDOCK_CHART_BRANCH=master
-export MAAS_CHART_REPO=https://github.com/sh8121att/helm_charts
-export MAAS_CHART_BRANCH=master
-export CEPH_CHART_BRANCH=84901ac56db1647e40fe0015983653e48ff90f5b
-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 PROMENADE_IMAGE=quay.io/attcomdev/promenade:v0.2.2
+export ARMADA_IMAGE=quay.io/attcomdev/armada:v0.7.0
+export DRYDOCK_IMAGE=quay.io/attcomdev/drydock:v0.2.0