Armada: Update ceph deployment to correctly specify options

This PS updates the armada manifests used in the gate to correctly
specify the options applied.

Change-Id: Ie755e5372207328363b5999f6d36268e20e7e3e8

tools/deployment/armada/multinode/armada-ceph.yaml

@@ -88,8 +88,29 @@ data:
     bootstrap:
       enabled: true
     conf:
+      ceph:
+        global:
+          #NOTE (portdirect): any uuidv4 value is acceptable here, though must
+          # be consistent if you wish to redploy whist maintaining data.
+          fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
       rgw_ks:
         enabled: true
+      pool:
+        crush:
+          #NOTE(portdirect): set to hammer if using kernel < 4.5
+          tunables: null
+        target:
+          # NOTE(portdirect): 5 nodes, with one osd per node
+          osd: 5
+          pg_per_osd: 100
+      storage:
+        osd:
+          - data:
+              type: directory
+              location: /var/lib/openstack-helm/ceph/osd/osd-one
+            journal:
+              type: directory
+              location: /var/lib/openstack-helm/ceph/osd/journal-one
   source:
     type: local
     location: ${OSH_PATH}

tools/deployment/armada/multinode/armada-osh.yaml

@@ -82,6 +82,10 @@ data:
             application: ceph
             component: namespace-client-key-generator
   values:
+    labels:
+      jobs:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
     endpoints:
       identity:
         namespace: openstack
@@ -89,10 +93,6 @@ data:
         namespace: ceph
       ceph_mon:
         namespace: ceph
-    labels:
-      jobs:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
     network:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
@@ -102,10 +102,15 @@ data:
       rbd_provisioner: false
       cephfs_provisioner: false
       client_secrets: true
-      rgw_user_and_endpoints: false
+      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: false
     conf:
+      ceph:
+        global:
+          #NOTE (portdirect): any uuidv4 value is acceptable here, though must
+          # be consistent if you wish to redploy whist maintaining data.
+          fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
       rgw_ks:
         enabled: true
   source:
@@ -338,10 +343,6 @@ data:
         namespace: ceph
       ceph_mon:
         namespace: ceph
-    labels:
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
     bootstrap:
       enabled: false
     conf: