Fixes for UCP deployment

- Update Armada default image to armada:latest instead of armada:master as the master tag is no longer applied to builds - Add the Foundry Artifactory as a insecure registry - Update the drydock sample Deckhand-based topology document to reflect valid Deckhand documents - Remove the cephfs_provisioner from the ceph client namespace chart - Update the Ceph chart to specify valid job deletion hooks - Remove the dependencies from the Ceph chart as the chart defaults now care for this. Change-Id: Idf7e91da97e758ed0f55e30cbc0248f532ae643a
2018-01-09 10:48:51 -06:00 · 2018-01-09 10:48:51 -06:00 · 7e8e972908
parent 4b03603443
commit 7e8e972908
5 changed files with 95 additions and 69 deletions
--- a/manifests/basic_ucp/Docker.yaml
+++ b/manifests/basic_ucp/Docker.yaml
@ -10,6 +10,7 @@ data:
  config:
    insecure-registries:
      - registry:5000
+      - 10.24.20.19:30092
    live-restore: true
    storage-driver: overlay2
 ...
--- a/manifests/basic_ucp/armada.yaml.sub
+++ b/manifests/basic_ucp/armada.yaml.sub
@ -35,64 +35,31 @@ data:
    no_hooks: false
    pre:
      delete:
-        - name: ceph-bootstrap
-          type: job
+        - type: job
          labels:
-            - application: ceph
-            - component: bootstrap
-            - release_group: armada-ucp
-        - name: ceph-mds-keyring-generator
-          type: job
+            application: ceph
+            component: bootstrap
+        - type: job
          labels:
-            - application: ceph
-            - component: mds-keyring-generator
-            - release_group: armada-ucp
-        - name: ceph-mon-keyring-generator
-          type: job
+            application: ceph
+            component: mds-keyring-generator
+        - type: job
          labels:
-            - application: ceph
-            - component: mon-keyring-generator
-            - release_group: armada-ucp
-        - name: ceph-rgw-keyring-generator
-          type: job
+            application: ceph
+            component: mon-keyring-generator
+        - type: job
          labels:
-            - application: ceph
-            - component: rgw-keyring-generator
-            - release_group: armada-ucp
-        - name: ceph-storage-keys-generator
-          type: job
+            application: ceph
+            component: rgw-keyring-generator
+        - type: job
          labels:
-            - application: ceph
-            - component: storage-keys-generator
-            - release_group: armada-ucp
-        - name: ceph-osd-keyring-generator
-          type: job
+            application: ceph
+            component: storage-keys-generator
+        - type: job
          labels:
-            - application: ceph
-            - component: osd-keyring-generator
-            - release_group: armada-ucp
+            application: ceph
+            component: osd-keyring-generator
  values:
-    dependencies:
-      mgr:
-        jobs:
-          - 'ceph-storage-keys-generator'
-          - 'ceph-mgr-keyring-generator'
-      mon:
-        jobs:
-          - 'ceph-storage-keys-generator'
-          - 'ceph-mon-keyring-generator'
-      osd:
-        jobs:
-          - 'ceph-storage-keys-generator'
-          - 'ceph-osd-keyring-generator'
-      rgw:
-        jobs:
-          - 'ceph-storage-keys-generator'
-          - 'ceph-rgw-keyring-generator'
-      mds:
-        jobs:
-          - 'ceph-storage-keys-generator'
-          - 'ceph-mds-keyring-generator'
    conf:
      ceph:
        config:
@ -120,6 +87,7 @@ data:
      storage_secrets: true
      ceph: true
      rbd_provisioner: true
+      cephfs_provisioner: true
      client_secrets: false
      rgw_keystone_user_and_endpoints: false
    bootstrap:
@ -147,12 +115,10 @@ data:
    no_hooks: false
    pre:
      delete:
-        - name: ceph-namespace-client-key-generator
-          type: job
+        - type: job
          labels:
-            - application: ceph
-            - component: namespace-client-key-generator
-            - release_group: armada-ucp
+            application: ceph
+            component: namespace-client-key-generator
  values:
    labels:
      jobs:
@ -174,6 +140,7 @@ data:
      storage_secrets: false
      ceph: false
      rbd_provisioner: false
+      cephfs_provisioner: false
      client_secrets: true
      rgw_keystone_user_and_endpoints: false
  source:
--- a/manifests/basic_ucp/deploy_ucp.sh
+++ b/manifests/basic_ucp/deploy_ucp.sh
@ -95,8 +95,8 @@ function init_env {

    # Images
    export TILLER_IMAGE=${TILLER_IMAGE:-"gcr.io/kubernetes-helm/tiller:v2.7.2"}
-    export DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:master"}
-    export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:master"}
+    export DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"quay.io/attcomdev/drydock:latest"}
+    export ARMADA_IMAGE=${ARMADA_IMAGE:-"quay.io/attcomdev/armada:latest"}
    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"}
--- a/manifests/basic_ucp/drydock_deckhand.yaml
+++ b/manifests/basic_ucp/drydock_deckhand.yaml
@ -12,10 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+schema: deckhand/LayeringPolicy/v1
+metadata:
+  schema: metadata/Control/v1
+  name: layering-policy
+  layeringDefinition:
+    abstract: false
+    layer: site
+data:
+  layerOrder:
+    - site
+---
 schema: 'drydock/Region/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: atl_foundry
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  tag_definitions:
  - tag: 'high_memory'
@ -32,6 +46,9 @@ schema: 'drydock/NetworkLink/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: oob
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  labels:
    noconfig: 'enabled'
@ -49,6 +66,9 @@ schema: 'drydock/NetworkLink/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: pxe-rack1
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  bonding:
    mode: 'disabled'
@ -60,10 +80,31 @@ data:
  allowed_networks:
  - 'pxe-rack1'
 ---
+schema: 'drydock/NetworkLink/v1'
+metadata:
+  schema: 'metadata/Document/v1'
+  name: mgmt
+  layeringDefinition:
+    abstract: false
+    layer: site
+data:
+  bonding:
+    mode: 'disabled'
+  mtu: 1500
+  linkspeed: 'auto'
+  trunking:
+    mode: disabled
+    default_network: mgmt
+  allowed_networks:
+    - 'mgmt'
+---
 schema: 'drydock/Network/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: oob
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  labels:
    noconfig: 'enabled'
@ -73,6 +114,9 @@ schema: 'drydock/Network/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: pxe-rack1
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  cidr: '172.24.1.0/24'
  routes:
@ -90,7 +134,10 @@ data:
 schema: 'drydock/Network/v1'
 metadata:
  schema: 'metadata/Document/v1'
-  name: pxe-rack2
+  name: mgmt
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  cidr: '172.24.2.0/24'
  routes:
@ -109,6 +156,9 @@ schema: 'drydock/HardwareProfile/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: DellR820v1
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  vendor: 'Dell'
  generation: '1'
@ -127,6 +177,9 @@ schema: 'drydock/HostProfile/v1'
 metadata:
  name: defaults
  schema: 'metadata/Document/v1'
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  hardware_profile: 'DellR820v1'
  primary_network: 'pxe-rack1'
@ -142,7 +195,7 @@ data:
          bootdrive: 'true'
        partitions:
          - name: 'root'
-            size: '10g'
+            size: '20g'
            bootable: true
            filesystem:
              mountpoint: '/'
@ -155,12 +208,12 @@ data:
              fstype: 'ext4'
              mount_options: 'defaults'
  interfaces:
-    ens3f0:
-      device_link: 'pxe-rack1'
+    ens3:
+      device_link: 'mgmt'
      slaves:
        - 'ens3f0'
      networks:
-        - 'pxe-rack1'
+        - 'mgmt'
  platform:
      image: 'ubuntu/xenial'
      kernel: 'generic'
@ -171,11 +224,14 @@ schema: 'drydock/BaremetalNode/v1'
 metadata:
  schema: 'metadata/Document/v1'
  name: node2
+  layeringDefinition:
+    abstract: false
+    layer: site
 data:
  host_profile: defaults
  addressing:
-    - network: 'pxe-rack1'
-      address: '172.24.1.101'
+    - network: 'mgmt'
+      address: '172.24.2.101'
    - network: 'oob'
      address: '172.24.10.101'
  metadata:
@ -188,6 +244,9 @@ metadata:
  schema: 'metadata/Document/v1'
  name: promjoin
  storagePolicy: 'cleartext'
+  layeringDefinition:
+    abstract: false
+    layer: site
  labels:
    application: 'drydock'
 data:
@ -201,7 +260,7 @@ data:
    - path: /opt/promjoin.sh
      type: file
      permissions: '555'
-      location: http://172.24.1.100:6880/{{node.hostname}}.join
+      location: promenade+http://promenade-api.ucp.svc.cluster.local/ap/v1.0/join-scripts?design_ref={{ action.design_ref }}&hostname={{ node.hostname }}&ip={{ node.network.mgmt.ip }}&{% for k, v in node.labels.items() %}labels.dynamic={{ k }}={{ v }}{% endfor %}
      location_pipeline:
        - template
      data_pipeline:
--- a/manifests/basic_ucp/set-env.sh
+++ b/manifests/basic_ucp/set-env.sh
@ -5,6 +5,5 @@ export GENESIS_NODE_IP=172.24.1.100
 export MASTER_NODE_IP=172.24.1.101
 export NODE_NET_IFACE=ens3
 export PROMENADE_IMAGE=quay.io/attcomdev/promenade:master
-export ARMADA_IMAGE=quay.io/attcomdev/armada:master
-export DRYDOCK_IMAGE=sthussey/drydock:391039v1
-export MAAS_CACHE_IMAGE=sthussey/maas-cache:cachetest
+export ARMADA_IMAGE=quay.io/attcomdev/armada:latest
+export DRYDOCK_IMAGE=quay.io/attcomdev/drydock:latest