Remove all trailing whitespaces
This change removes any trailing whitespaces found while
running:
find . -type f -exec egrep -l " +$" {} \;
Change-Id: Ic1dc8765a0971a32da4c3116871e9450a55b357f
This commit is contained in:
@@ -18,7 +18,7 @@ kind: Secret
|
|||||||
metadata:
|
metadata:
|
||||||
name: "pvc-ceph-conf-combined-storageclass"
|
name: "pvc-ceph-conf-combined-storageclass"
|
||||||
type: kubernetes.io/rbd
|
type: kubernetes.io/rbd
|
||||||
data:
|
data:
|
||||||
key: |
|
key: |
|
||||||
{{ include "secrets/ceph-client-key" . | b64enc | indent 4 }}
|
{{ include "secrets/ceph-client-key" . | b64enc | indent 4 }}
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: helm-toolkit
|
- name: helm-toolkit
|
||||||
repository: http://localhost:8879/charts
|
repository: http://localhost:8879/charts
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ spec:
|
|||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
||||||
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
@@ -42,10 +42,10 @@
|
|||||||
|
|
||||||
# this function helps resolve database style endpoints, which really follow the same
|
# this function helps resolve database style endpoints, which really follow the same
|
||||||
# pattern as above, except they have a username and password component
|
# pattern as above, except they have a username and password component
|
||||||
#
|
#
|
||||||
# presuming that .Values contains an endpoint: definition for 'neutron-db' with the
|
# presuming that .Values contains an endpoint: definition for 'neutron-db' with the
|
||||||
# appropriate attributes, a call such as:
|
# appropriate attributes, a call such as:
|
||||||
#
|
#
|
||||||
# { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" }
|
# { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" }
|
||||||
#
|
#
|
||||||
# where portName is optional if a default port has been defined in .Values
|
# where portName is optional if a default port has been defined in .Values
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
# this function returns hostnames from endpoint definitions for use cases
|
# this function returns hostnames from endpoint definitions for use cases
|
||||||
# where the uri style return is not appropriate, and only the hostname
|
# where the uri style return is not appropriate, and only the hostname
|
||||||
# portion is used or relevant in the template
|
# portion is used or relevant in the template
|
||||||
#
|
#
|
||||||
# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.hostname_endpoint_uri_lookup" }
|
# { tuple "memcache" "internal" "portName" . | include "helm-toolkit.hostname_endpoint_uri_lookup" }
|
||||||
|
|||||||
@@ -37,4 +37,4 @@ spec:
|
|||||||
image: ceph-rbd-test
|
image: ceph-rbd-test
|
||||||
pool: rbd
|
pool: rbd
|
||||||
secretRef:
|
secretRef:
|
||||||
name: ceph-client-key
|
name: ceph-client-key
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ rm -rf /var/run/apache2/*
|
|||||||
APACHE_DIR="apache2"
|
APACHE_DIR="apache2"
|
||||||
|
|
||||||
# Compress Horizon's assets.
|
# Compress Horizon's assets.
|
||||||
/var/lib/kolla/venv/bin/manage.py collectstatic --noinput
|
/var/lib/kolla/venv/bin/manage.py collectstatic --noinput
|
||||||
/var/lib/kolla/venv/bin/manage.py compress --force
|
/var/lib/kolla/venv/bin/manage.py compress --force
|
||||||
rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
|
rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ spec:
|
|||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
||||||
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
@@ -32,4 +32,4 @@ data:
|
|||||||
networking.cnf: |
|
networking.cnf: |
|
||||||
{{ tuple "etc/_networking.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
{{ tuple "etc/_networking.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
||||||
wsrep.cnf: |
|
wsrep.cnf: |
|
||||||
{{ tuple "etc/_wsrep.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
{{ tuple "etc/_wsrep.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ spec:
|
|||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
||||||
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ chown neutron: /run/openvswitch/db.sock
|
|||||||
# on deaemonsets - note that a show is not sufficient
|
# on deaemonsets - note that a show is not sufficient
|
||||||
# here, we need to communicate with both the db and vswitchd
|
# here, we need to communicate with both the db and vswitchd
|
||||||
# which means we need to do a create action
|
# which means we need to do a create action
|
||||||
#
|
#
|
||||||
# see https://github.com/att-comdev/openstack-helm/issues/88
|
# see https://github.com/att-comdev/openstack-helm/issues/88
|
||||||
timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --ovsdb_native --nokeepalived_ipv6_support
|
timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --ovsdb_native --nokeepalived_ipv6_support
|
||||||
|
|
||||||
|
|||||||
@@ -21,5 +21,5 @@ if [[ ! -e "/run/openvswitch/conf.db" ]]; then
|
|||||||
ovsdb-tool create "/run/openvswitch/conf.db"
|
ovsdb-tool create "/run/openvswitch/conf.db"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
umask 000
|
umask 000
|
||||||
exec /usr/sbin/ovsdb-server /run/openvswitch/conf.db -vconsole:emer -vconsole:err -vconsole:info --remote=punix:/run/openvswitch/db.sock
|
exec /usr/sbin/ovsdb-server /run/openvswitch/conf.db -vconsole:emer -vconsole:err -vconsole:info --remote=punix:/run/openvswitch/db.sock
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ spec:
|
|||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
||||||
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -70,7 +70,7 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: rabbitmq
|
- name: rabbitmq
|
||||||
image: {{ .Values.images.rabbitmq }}
|
image: {{ .Values.images.rabbitmq }}
|
||||||
{{- if .Values.resources.enabled }}
|
{{- if .Values.resources.enabled }}
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: {{ .Values.resources.api.limits.cpu | quote }}
|
cpu: {{ .Values.resources.api.limits.cpu | quote }}
|
||||||
|
|||||||
Reference in New Issue
Block a user