diff --git a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec index b300107a..ec723a12 100644 --- a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec +++ b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec @@ -18,6 +18,7 @@ BuildArch: noarch Patch01: 0001-gnocchi-chart-updates.patch Patch02: Mariadb-Support-adoption-of-running-single-node-mari.patch Patch03: 0004-Allow-multiple-containers-per-daemonset-pod.patch +Patch04: fix-type-error-to-streamline-single-replica-mariadb-.patch BuildRequires: helm @@ -29,6 +30,7 @@ Openstack Helm Infra charts %patch01 -p1 %patch02 -p1 %patch03 -p1 +%patch04 -p1 %build # initialize helm and build the toolkit diff --git a/openstack/openstack-helm-infra/files/fix-type-error-to-streamline-single-replica-mariadb-.patch b/openstack/openstack-helm-infra/files/fix-type-error-to-streamline-single-replica-mariadb-.patch new file mode 100644 index 00000000..c12ac9f7 --- /dev/null +++ b/openstack/openstack-helm-infra/files/fix-type-error-to-streamline-single-replica-mariadb-.patch @@ -0,0 +1,34 @@ +From d983c89dbce840fad50f49e4253ecc7930f15338 Mon Sep 17 00:00:00 2001 +From: Chris Friesen +Date: Wed, 6 Feb 2019 17:19:39 -0600 +Subject: [PATCH] fix type error to streamline single-replica mariadb startup + +The mariadb startup script was trying to optimize the single-replica +case but missed the fact that the variable it was checking was a +string rather than an int. + +Converting it to an int before doing the comparison makes it work +as expected. + +Change-Id: I8612e9e8ef5ec8ff61ecf0782f262a5feafd501a +Signed-off-by: Chris Friesen +--- + mariadb/templates/bin/_start.py.tpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mariadb/templates/bin/_start.py.tpl b/mariadb/templates/bin/_start.py.tpl +index 4d4428c..d0b9c8e 100644 +--- a/mariadb/templates/bin/_start.py.tpl ++++ b/mariadb/templates/bin/_start.py.tpl +@@ -729,7 +729,7 @@ elif get_cluster_state() == 'init': + run_mysqld() + elif get_cluster_state() == 'live': + logger.info("Cluster has been running starting restore/rejoin") +- if not mariadb_replicas > 1: ++ if not int(mariadb_replicas) > 1: + logger.info( + "There is only a single node in this cluster, we are good to go") + update_grastate_on_restart() +-- +1.8.3.1 + diff --git a/openstack/openstack-helm/centos/openstack-helm.spec b/openstack/openstack-helm/centos/openstack-helm.spec index 94931314..efb1dfc7 100644 --- a/openstack/openstack-helm/centos/openstack-helm.spec +++ b/openstack/openstack-helm/centos/openstack-helm.spec @@ -24,9 +24,10 @@ Patch03: 0003-Add-Panko-Chart.patch Patch04: Remove-stale-Apache2-service-pids-when-a-POD-starts.patch Patch05: 0005-Add-heat-purge-deleted-cron-job.patch Patch06: 0006-Enable-cold-migration-in-nova-helm-chart.patch -Patch07: 0007-Stein-Remove-ceilometer-upgrade-option.patch -Patch08: 0008-Stein-Update-Cinder-to-include-resource_filters.json.patch -Patch09: 0009-Stein-add-log_config_append-to-neutron-etc.patch +Patch07: 0007-Glance-chart-add-images-pool-replication.patch +Patch08: 0007-Stein-Remove-ceilometer-upgrade-option.patch +Patch09: 0008-Stein-Update-Cinder-to-include-resource_filters.json.patch +Patch10: 0009-Stein-add-log_config_append-to-neutron-etc.patch BuildRequires: helm BuildRequires: openstack-helm-infra @@ -46,6 +47,7 @@ Openstack Helm charts %patch07 -p1 %patch08 -p1 %patch09 -p1 +%patch10 -p1 %build # initialize helm and build the toolkit diff --git a/openstack/openstack-helm/files/0007-Glance-chart-add-images-pool-replication.patch b/openstack/openstack-helm/files/0007-Glance-chart-add-images-pool-replication.patch new file mode 100644 index 00000000..53f983ca --- /dev/null +++ b/openstack/openstack-helm/files/0007-Glance-chart-add-images-pool-replication.patch @@ -0,0 +1,55 @@ +From 5480584be125316f3ce325fd1d0e9b4022db5c69 Mon Sep 17 00:00:00 2001 +From: Irina Mihai +Date: Fri, 1 Feb 2019 16:02:46 -0500 +Subject: [PATCH] Add replication support for the images rbd pool + +--- + glance/templates/bin/_storage-init.sh.tpl | 2 ++ + glance/templates/job-storage-init.yaml | 4 ++++ + glance/values.yaml | 2 ++ + 3 files changed, 8 insertions(+) + +diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl +index 4082c52..e6bd188 100755 +--- a/glance/templates/bin/_storage-init.sh.tpl ++++ b/glance/templates/bin/_storage-init.sh.tpl +@@ -47,6 +47,8 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then + if [[ ${test_luminous} -gt 0 ]]; then + ceph osd pool application enable "$1" "$3" + fi ++ ceph osd pool set $1 size ${RBD_POOL_REPLICATION} ++ ceph osd pool set $1 crush_rule "${RBD_POOL_CRUSH_RULE}" + } + ensure_pool "${RBD_POOL_NAME}" "${RBD_POOL_CHUNK_SIZE}" "glance-image" + +diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml +index 9d95627..c0cd186 100755 +--- a/glance/templates/job-storage-init.yaml ++++ b/glance/templates/job-storage-init.yaml +@@ -103,6 +103,10 @@ spec: + value: {{ .Values.conf.glance.glance_store.rbd_store_pool | quote }} + - name: RBD_POOL_USER + value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }} ++ - name: RBD_POOL_REPLICATION ++ value: {{ .Values.conf.glance.glance_store.rbd_store_replication | quote }} ++ - name: RBD_POOL_CRUSH_RULE ++ value: {{ .Values.conf.glance.glance_store.rbd_store_crush_rule | quote }} + - name: RBD_POOL_CHUNK_SIZE + value: {{ .Values.conf.glance.glance_store.rbd_store_chunk_size | quote }} + - name: RBD_POOL_SECRET +diff --git a/glance/values.yaml b/glance/values.yaml +index 5ae9863..4d482d1 100755 +--- a/glance/values.yaml ++++ b/glance/values.yaml +@@ -268,6 +268,8 @@ conf: + memcache_security_strategy: ENCRYPT + glance_store: + rbd_store_chunk_size: 8 ++ rbd_store_replication: 1 ++ rbd_store_crush_rule: replicated_rule + rbd_store_pool: glance.images + rbd_store_user: glance + rbd_store_ceph_conf: /etc/ceph/ceph.conf +-- +2.7.4 + diff --git a/openstack/python-horizon/centos/files/horizon.init b/openstack/python-horizon/centos/files/horizon.init index b0c5ad21..36f2340d 100755 --- a/openstack/python-horizon/centos/files/horizon.init +++ b/openstack/python-horizon/centos/files/horizon.init @@ -20,7 +20,7 @@ PYTHON=`which python` MANAGE="/usr/share/openstack-dashboard/manage.py" EXEC="/usr/bin/gunicorn" BIND="localhost" -PORT="8080" +PORT="8008" WORKER="eventlet" WORKERS=`grep workers /etc/openstack-dashboard/horizon-config.ini | cut -f3 -d' '` # Increased timeout to facilitate large image uploads