Ceilometer: use endpoints section and lookups to set port
This PS moves ceilometer to use the endpoints section and lookups to set the port it serves on. Change-Id: I7f80dfd51394230883321fbfef5adcbc14da3626
This commit is contained in:
parent
16c6d31155
commit
20c40c3f9b
@ -63,10 +63,10 @@ spec:
|
||||
- stop
|
||||
ports:
|
||||
- name: ce-api
|
||||
containerPort: {{ .Values.network.api.port }}
|
||||
containerPort: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
readinessProbe:
|
||||
tcpSocket:
|
||||
port: {{ .Values.network.api.port }}
|
||||
port: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
volumeMounts:
|
||||
- name: pod-etc-ceilometer
|
||||
mountPath: /etc/ceilometer
|
||||
|
@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/}}
|
||||
|
||||
Listen 0.0.0.0:{{ .Values.network.api.port }}
|
||||
Listen 0.0.0.0:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
|
||||
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
||||
|
||||
<VirtualHost *:{{ .Values.network.api.port }}>
|
||||
<VirtualHost *:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
|
||||
LogLevel info
|
||||
WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
|
||||
WSGIProcessGroup ceilometer-api
|
||||
|
@ -24,7 +24,7 @@ metadata:
|
||||
spec:
|
||||
ports:
|
||||
- name: ce-api
|
||||
port: {{ .Values.network.api.port }}
|
||||
port: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
{{ if .Values.network.api.node_port.enabled }}
|
||||
nodePort: {{ .Values.network.api.node_port.port }}
|
||||
{{ end }}
|
||||
|
@ -1717,21 +1717,6 @@ endpoints:
|
||||
api:
|
||||
default: 8042
|
||||
public: 80
|
||||
event:
|
||||
name: panko
|
||||
hosts:
|
||||
default: panko-api
|
||||
public: panko
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
path:
|
||||
default: null
|
||||
scheme:
|
||||
default: 'http'
|
||||
port:
|
||||
api:
|
||||
default: 8777
|
||||
public: 80
|
||||
oslo_db:
|
||||
auth:
|
||||
admin:
|
||||
|
Loading…
Reference in New Issue
Block a user