From aca30bb14cdd80a5ba4d7b2adf167027a9193737 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 18 Jun 2018 11:03:50 -0500 Subject: [PATCH] Update armada multinode manifests This updates the values in the armada LMA and OSH manifests to include similar overrides for ceph to those used in the standard multinode gates Change-Id: I435ae0ad761da626591fa45486764d71566fd966 --- .../armada/020-armada-render-manifests.sh | 12 +++ .../armada/multinode/armada-ceph.yaml | 78 ++++++++----------- .../armada/multinode/armada-lma.yaml | 4 + .../armada/multinode/armada-osh.yaml | 20 ++--- 4 files changed, 58 insertions(+), 56 deletions(-) diff --git a/tools/deployment/armada/020-armada-render-manifests.sh b/tools/deployment/armada/020-armada-render-manifests.sh index 15a5717620..129ccb2125 100755 --- a/tools/deployment/armada/020-armada-render-manifests.sh +++ b/tools/deployment/armada/020-armada-render-manifests.sh @@ -20,7 +20,19 @@ source ./tools/deployment/armada/generate-passwords.sh : ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_PATH:="./"} +[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt +#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this +# should be set to 'hammer' +. /etc/os-release +if [ "x${ID}" == "xubuntu" ] && \ + [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then + export CRUSH_TUNABLES=hammer +else + export CRUSH_TUNABLES=null +fi + export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) +export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }') export OSH_INFRA_PATH export OSH_PATH diff --git a/tools/deployment/armada/multinode/armada-ceph.yaml b/tools/deployment/armada/multinode/armada-ceph.yaml index b9da6e5faf..5c62b60c32 100644 --- a/tools/deployment/armada/multinode/armada-ceph.yaml +++ b/tools/deployment/armada/multinode/armada-ceph.yaml @@ -73,32 +73,27 @@ data: namespace: ceph ceph_mon: namespace: ceph - fluentd: - namespace: osh-infra network: public: ${CEPH_NETWORK} cluster: ${CEPH_NETWORK} deployment: - storage_secrets: True - ceph: True - rbd_provisioner: True - cephfs_provisioner: True - client_secrets: False - rgw_keystone_user_and_endpoints: False + storage_secrets: true + ceph: true + rbd_provisioner: true + cephfs_provisioner: true + client_secrets: false + rgw_keystone_user_and_endpoints: false bootstrap: - enabled: True + 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 + fsid: ${CEPH_FS_ID} rgw_ks: - enabled: True + enabled: true pool: crush: - #NOTE(portdirect): set to hammer if using kernel < 4.5 - tunables: null + tunables: ${CRUSH_TUNABLES} target: # NOTE(portdirect): 5 nodes, with one osd per node osd: 5 @@ -112,8 +107,7 @@ data: type: directory location: /var/lib/openstack-helm/ceph/osd/journal-one logging: - fluentd: - enabled: true + fluentd: true source: type: local location: ${OSH_PATH} @@ -146,32 +140,27 @@ data: namespace: ceph ceph_mon: namespace: ceph - fluentd: - namespace: osh-infra network: public: ${CEPH_NETWORK} cluster: ${CEPH_NETWORK} deployment: - storage_secrets: True - ceph: True - rbd_provisioner: True - cephfs_provisioner: True - client_secrets: False - rgw_keystone_user_and_endpoints: False + storage_secrets: true + ceph: true + rbd_provisioner: true + cephfs_provisioner: true + client_secrets: false + rgw_keystone_user_and_endpoints: false bootstrap: - enabled: True + 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 + fsid: ${CEPH_FS_ID} rgw_ks: - enabled: True + enabled: true pool: crush: - #NOTE(portdirect): set to hammer if using kernel < 4.5 - tunables: null + tunables: ${CRUSH_TUNABLES} target: # NOTE(portdirect): 5 nodes, with one osd per node osd: 5 @@ -185,8 +174,7 @@ data: type: directory location: /var/lib/openstack-helm/ceph/osd/journal-one logging: - fluentd: - enabled: true + fluentd: true source: type: local location: ${OSH_PATH} @@ -237,21 +225,23 @@ data: public: ${CEPH_NETWORK} cluster: ${CEPH_NETWORK} deployment: - storage_secrets: True - ceph: True - rbd_provisioner: True - cephfs_provisioner: True - client_secrets: False - rgw_keystone_user_and_endpoints: False + storage_secrets: true + ceph: true + rbd_provisioner: true + cephfs_provisioner: true + client_secrets: false + rgw_keystone_user_and_endpoints: false bootstrap: - enabled: True + enabled: true conf: + ceph: + global: + fsid: ${CEPH_FS_ID} rgw_ks: - enabled: True + enabled: true pool: crush: - #NOTE(portdirect): set to hammer if using kernel < 4.5 - tunables: null + tunables: ${CRUSH_TUNABLES} target: # NOTE(portdirect): 5 nodes, with one osd per node osd: 5 diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml index e34559802e..e7555150ac 100644 --- a/tools/deployment/armada/multinode/armada-lma.yaml +++ b/tools/deployment/armada/multinode/armada-lma.yaml @@ -132,6 +132,8 @@ data: job: node_selector_key: openstack-control-plane node_selector_value: enabled + bootstrap: + enabled: true source: type: local location: ${OSH_INFRA_PATH} @@ -165,6 +167,8 @@ data: auth: admin: password: ${DB_ADMIN_PASSWORD} + volume: + enabled: false labels: server: node_selector_key: openstack-control-plane diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml index e44c9f807b..0a89ff7d25 100644 --- a/tools/deployment/armada/multinode/armada-osh.yaml +++ b/tools/deployment/armada/multinode/armada-osh.yaml @@ -93,17 +93,17 @@ data: public: ${CEPH_NETWORK} cluster: ${CEPH_NETWORK} deployment: - storage_secrets: False - ceph: False - rbd_provisioner: False - cephfs_provisioner: False - client_secrets: True - rgw_keystone_user_and_endpoints: False + storage_secrets: false + ceph: false + rbd_provisioner: false + cephfs_provisioner: false + client_secrets: true + rgw_keystone_user_and_endpoints: false bootstrap: - enabled: False + enabled: false conf: rgw_ks: - enabled: True + enabled: true source: type: local location: ${OSH_PATH} @@ -718,10 +718,6 @@ data: chart_name: libvirt release: libvirt namespace: openstack - wait: - timeout: 1800 - labels: - release_group: osh-libvirt install: no_hooks: False upgrade: