From 42e6001a78aa495baddb5308d7035f0c3ddeb557 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Mon, 19 Dec 2016 15:37:39 -0800
Subject: [PATCH 1/6] Initial commit of horizon chart
---
Makefile | 4 +-
common/templates/_endpoints.tpl | 8 +
common/templates/_hosts.tpl | 12 +-
common/values.yaml | 3 +-
horizon/Chart.yaml | 3 +
horizon/requirements.lock | 6 +
horizon/requirements.yaml | 4 +
horizon/templates/bin/_start.sh.tpl | 17 +
horizon/templates/configmap-bin.yaml | 7 +
horizon/templates/configmap-etc.yaml | 9 +
horizon/templates/deployment.yaml | 69 +++
horizon/templates/etc/_horizon.conf.tpl | 22 +
horizon/templates/etc/_local_settings.tpl | 649 ++++++++++++++++++++++
horizon/templates/service.yaml | 9 +
horizon/values.yaml | 36 ++
15 files changed, 851 insertions(+), 7 deletions(-)
create mode 100644 common/templates/_endpoints.tpl
create mode 100644 horizon/Chart.yaml
create mode 100644 horizon/requirements.lock
create mode 100644 horizon/requirements.yaml
create mode 100644 horizon/templates/bin/_start.sh.tpl
create mode 100644 horizon/templates/configmap-bin.yaml
create mode 100644 horizon/templates/configmap-etc.yaml
create mode 100644 horizon/templates/deployment.yaml
create mode 100644 horizon/templates/etc/_horizon.conf.tpl
create mode 100644 horizon/templates/etc/_local_settings.tpl
create mode 100644 horizon/templates/service.yaml
create mode 100644 horizon/values.yaml
diff --git a/Makefile b/Makefile
index 1e772b407d..2e7a02884a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ B64_EXCLUDE := $(wildcard common/secrets/*.b64)
CHARTS := ceph mariadb rabbitmq memcached keystone openstack
COMMON_TPL := common/templates/_globals.tpl
-all: common bootstrap mariadb rabbitmq memcached keystone openstack
+all: common bootstrap mariadb rabbitmq memcached keystone horizon openstack
common: build-common
@@ -18,6 +18,8 @@ mariadb: build-mariadb
keystone: build-keystone
+horizon: build-horizon
+
rabbitmq: build-rabbitmq
memcached: build-memcached
diff --git a/common/templates/_endpoints.tpl b/common/templates/_endpoints.tpl
new file mode 100644
index 0000000000..90f591e4d8
--- /dev/null
+++ b/common/templates/_endpoints.tpl
@@ -0,0 +1,8 @@
+#-----------------------------------------
+# endpoints
+#-----------------------------------------
+{{- define "endpoint_keystone_internal" -}}
+{{- with .Values.endpoints.keystone -}}
+ {{.scheme}}://{{.hosts.internal | default .hosts.default}}:{{.port.public}}{{.path}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/common/templates/_hosts.tpl b/common/templates/_hosts.tpl
index bf55a255ce..275faed992 100644
--- a/common/templates/_hosts.tpl
+++ b/common/templates/_hosts.tpl
@@ -1,14 +1,18 @@
# fqdn
-{{- define "region"}}cluster{{- end}}
-{{- define "tld"}}local{{- end}}
+{{- define "dns_region"}}cluster{{- end}}
+{{- define "dns_tld"}}local{{- end}}
+
+#-----------------------------------------
+# hosts
+#-----------------------------------------
# infrastructure services
{{- define "rabbitmq_host"}}rabbitmq.{{.Release.Namespace}}.svc.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
{{- define "memcached_host"}}memcached.{{.Release.Namespace}}.svc.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
{{- define "mariadb_host"}}mariadb.{{.Release.Namespace}}.svc.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
-# keystone
-{{- define "keystone_db_host"}}{{ include "mariadb_host" . }}{{end}}
+# keystone defaults
+{{- define "keystone_db_host"}}{{ include "mariadb_host" . }}{{- end}}
{{- define "keystone_api_endpoint_host_admin"}}keystone-api.{{.Release.Namespace}}.svc.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
{{- define "keystone_api_endpoint_host_internal"}}keystone-api.{{.Release.Namespace}}.svc.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
{{- define "keystone_api_endpoint_host_public"}}keystone-api.{{ include "region" . }}.{{ include "tld" . }}{{- end}}
diff --git a/common/values.yaml b/common/values.yaml
index 630240e528..685d463e43 100644
--- a/common/values.yaml
+++ b/common/values.yaml
@@ -4,5 +4,4 @@
# name: value
global:
- region: cluster
- tld: local
\ No newline at end of file
+ fqdn_suffix: cluster.local
diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
new file mode 100644
index 0000000000..76e0f2c168
--- /dev/null
+++ b/horizon/Chart.yaml
@@ -0,0 +1,3 @@
+description: A Helm chart for horizon
+name: horizon
+version: 0.1.0
diff --git a/horizon/requirements.lock b/horizon/requirements.lock
new file mode 100644
index 0000000000..a30dd69a13
--- /dev/null
+++ b/horizon/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+ repository: http://localhost:8879/charts
+ version: 0.1.0
+digest: sha256:c6a7e430c900036912fe3fdc14213e9280c5da0b6607ce4dcf6dc95535d114fc
+generated: 2016-11-30T17:10:50.917838584-08:00
diff --git a/horizon/requirements.yaml b/horizon/requirements.yaml
new file mode 100644
index 0000000000..2350b1facb
--- /dev/null
+++ b/horizon/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+ - name: common
+ repository: http://localhost:8879/charts
+ version: 0.1.0
diff --git a/horizon/templates/bin/_start.sh.tpl b/horizon/templates/bin/_start.sh.tpl
new file mode 100644
index 0000000000..0741d29f74
--- /dev/null
+++ b/horizon/templates/bin/_start.sh.tpl
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -ex
+
+# Loading Apache2 ENV variables
+source /etc/apache2/envvars
+rm -rf /var/run/apache2/*
+APACHE_DIR="apache2"
+
+# Compress Horizon's assets.
+/var/lib/kolla/venv/bin/manage.py collectstatic --noinput
+/var/lib/kolla/venv/bin/manage.py compress --force
+rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
+
+# wsgi/horizon-http needs open files here, including secret_key_store
+chown -R horizon /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/
+
+apache2 -DFOREGROUND
\ No newline at end of file
diff --git a/horizon/templates/configmap-bin.yaml b/horizon/templates/configmap-bin.yaml
new file mode 100644
index 0000000000..61b4a0213a
--- /dev/null
+++ b/horizon/templates/configmap-bin.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: horizon-bin
+data:
+ start.sh: |
+{{ tuple "bin/_start.sh.tpl" . | include "template" | indent 4 }}
diff --git a/horizon/templates/configmap-etc.yaml b/horizon/templates/configmap-etc.yaml
new file mode 100644
index 0000000000..0f49b8c342
--- /dev/null
+++ b/horizon/templates/configmap-etc.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: horizon-etc
+data:
+ horizon.conf: |
+{{ tuple "etc/_horizon.conf.tpl" . | include "template" | indent 4 }}
+ local_settings: |
+{{ tuple "etc/_local_settings.tpl" . | include "template" | indent 4 }}
diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
new file mode 100644
index 0000000000..cb78e70b53
--- /dev/null
+++ b/horizon/templates/deployment.yaml
@@ -0,0 +1,69 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: horizon
+spec:
+ replicas: {{ .Values.replicas }}
+ template:
+ metadata:
+ labels:
+ app: horizon
+ annotations:
+ pod.beta.kubernetes.io/init-containers: '[
+ {
+ "name": "init",
+ "image": "{{ .Values.images.entrypoint }}",
+ "imagePullPolicy": "{{ .Values.images.pull_policy }}",
+ "env": [
+ {
+ "name": "NAMESPACE",
+ "value": "{{ .Release.Namespace }}"
+ },
+ {
+ "name": "DEPENDENCY_SERVICE",
+ "value": "memcached,keystone-api"
+ },
+ {
+ "name": "COMMAND",
+ "value": "echo done"
+ }
+ ]
+ }
+ ]'
+ spec:
+ nodeSelector:
+ {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+ containers:
+ - name: horizon
+ image: {{ .Values.images.horizon }}
+ imagePullPolicy: {{ .Values.images.pull_policy }}
+ command:
+ - bash
+ - /tmp/start.sh
+ ports:
+ - containerPort: {{ .Values.network.port }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.network.port }}
+ volumeMounts:
+ - name: startsh
+ mountPath: /tmp/start.sh
+ subPath: start.sh
+ - name: horizonconf
+ mountPath: /etc/apache2/sites-enabled/000-default.conf
+ subPath: horizon.conf
+ - name: localsettings
+ mountPath: /etc/openstack-dashboard/local_settings
+ subPath: local_settings
+ securityContext:
+ runAsUser: 0
+ volumes:
+ - name: startsh
+ configMap:
+ name: horizon-bin
+ - name: horizonconf
+ configMap:
+ name: horizon-etc
+ - name: localsettings
+ configMap:
+ name: horizon-etc
diff --git a/horizon/templates/etc/_horizon.conf.tpl b/horizon/templates/etc/_horizon.conf.tpl
new file mode 100644
index 0000000000..74915f7ac9
--- /dev/null
+++ b/horizon/templates/etc/_horizon.conf.tpl
@@ -0,0 +1,22 @@
+Listen 0.0.0.0:{{ .Values.network.port}}
+
+<VirtualHost *:{{ .Values.network.port}}>
+ LogLevel warn
+ ErrorLog /var/log/apache2/horizon.log
+ CustomLog /var/log/apache2/horizon-access.log combined
+
+ WSGIScriptReloading On
+ WSGIDaemonProcess horizon-http processes=5 threads=1 user=horizon group=horizon display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
+ WSGIProcessGroup horizon-http
+ WSGIScriptAlias / /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
+ WSGIPassAuthorization On
+
+ <Location "/">
+ Require all granted
+ </Location>
+
+ Alias /static /var/lib/kolla/venv/lib/python2.7/site-packages/static
+ <Location "/static">
+ SetHandler None
+ </Location>
+</Virtualhost>
\ No newline at end of file
diff --git a/horizon/templates/etc/_local_settings.tpl b/horizon/templates/etc/_local_settings.tpl
new file mode 100644
index 0000000000..cad765a1ab
--- /dev/null
+++ b/horizon/templates/etc/_local_settings.tpl
@@ -0,0 +1,649 @@
+import os
+
+from django.utils.translation import ugettext_lazy as _
+
+from openstack_dashboard import exceptions
+
+DEBUG = {{ .Values.local_settings.debug }}
+TEMPLATE_DEBUG = DEBUG
+
+COMPRESS_OFFLINE = True
+COMPRESS_CSS_HASHING_METHOD = "hash"
+
+# WEBROOT is the location relative to Webserver root
+# should end with a slash.
+WEBROOT = '/'
+# LOGIN_URL = WEBROOT + 'auth/login/'
+# LOGOUT_URL = WEBROOT + 'auth/logout/'
+#
+# LOGIN_REDIRECT_URL can be used as an alternative for
+# HORIZON_CONFIG.user_home, if user_home is not set.
+# Do not set it to '/home/', as this will cause circular redirect loop
+# LOGIN_REDIRECT_URL = WEBROOT
+
+# Required for Django 1.5.
+# If horizon is running in production (DEBUG is False), set this
+# with the list of host/domain names that the application can serve.
+# For more information see:
+# https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['*']
+
+# Set SSL proxy settings:
+# For Django 1.4+ pass this header from the proxy after terminating the SSL,
+# and don't forget to strip it from the client's request.
+# For more information see:
+# https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
+#SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
+# https://docs.djangoproject.com/en/1.5/ref/settings/#secure-proxy-ssl-header
+#SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
+# If Horizon is being served through SSL, then uncomment the following two
+# settings to better secure the cookies from security exploits
+#CSRF_COOKIE_SECURE = True
+#SESSION_COOKIE_SECURE = True
+
+# Overrides for OpenStack API versions. Use this setting to force the
+# OpenStack dashboard to use a specific API version for a given service API.
+# Versions specified here should be integers or floats, not strings.
+# NOTE: The version should be formatted as it appears in the URL for the
+# service API. For example, The identity service APIs have inconsistent
+# use of the decimal point, so valid options would be 2.0 or 3.
+#OPENSTACK_API_VERSIONS = {
+# "data-processing": 1.1,
+# "identity": 3,
+# "volume": 2,
+#}
+
+OPENSTACK_API_VERSIONS = {
+ "identity": 3,
+}
+
+# Set this to True if running on multi-domain model. When this is enabled, it
+# will require user to enter the Domain name in addition to username for login.
+#OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False
+
+# Overrides the default domain used when running on single-domain model
+# with Keystone V3. All entities will be created in the default domain.
+#OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default'
+
+# Set Console type:
+# valid options are "AUTO"(default), "VNC", "SPICE", "RDP", "SERIAL" or None
+# Set to None explicitly if you want to deactivate the console.
+#CONSOLE_TYPE = "AUTO"
+
+# Default OpenStack Dashboard configuration.
+HORIZON_CONFIG = {
+ 'user_home': 'openstack_dashboard.views.get_user_home',
+ 'ajax_queue_limit': 10,
+ 'auto_fade_alerts': {
+ 'delay': 3000,
+ 'fade_duration': 1500,
+ 'types': ['alert-success', 'alert-info']
+ },
+ 'help_url': "http://docs.openstack.org",
+ 'exceptions': {'recoverable': exceptions.RECOVERABLE,
+ 'not_found': exceptions.NOT_FOUND,
+ 'unauthorized': exceptions.UNAUTHORIZED},
+ 'modal_backdrop': 'static',
+ 'angular_modules': [],
+ 'js_files': [],
+ 'js_spec_files': [],
+}
+
+# Specify a regular expression to validate user passwords.
+#HORIZON_CONFIG["password_validator"] = {
+# "regex": '.*',
+# "help_text": _("Your password does not meet the requirements."),
+#}
+
+# Disable simplified floating IP address management for deployments with
+# multiple floating IP pools or complex network requirements.
+#HORIZON_CONFIG["simple_ip_management"] = False
+
+# Turn off browser autocompletion for forms including the login form and
+# the database creation workflow if so desired.
+#HORIZON_CONFIG["password_autocomplete"] = "off"
+
+# Setting this to True will disable the reveal button for password fields,
+# including on the login form.
+#HORIZON_CONFIG["disable_password_reveal"] = False
+
+LOCAL_PATH = '/tmp'
+
+# Set custom secret key:
+# You can either set it to a specific value or you can let horizon generate a
+# default secret key that is unique on this machine, e.i. regardless of the
+# amount of Python WSGI workers (if used behind Apache+mod_wsgi): However,
+# there may be situations where you would want to set this explicitly, e.g.
+# when multiple dashboard instances are distributed on different machines
+# (usually behind a load-balancer). Either you have to make sure that a session
+# gets all requests routed to the same dashboard instance or you set the same
+# SECRET_KEY for all of them.
+SECRET_KEY='{{ .Values.local_settings.horizon_secret_key }}'
+
+# Memcached session engine
+SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
+
+# We recommend you use memcached for development; otherwise after every reload
+# of the django development server, you will have to login again. To use
+# memcached set CACHES to something like
+CACHES = {
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+ 'LOCATION': '{{ include "memcached_host" . }}'
+ }
+}
+
+# Send email to the console by default
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+# Or send them to /dev/null
+#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
+
+# Configure these for your outgoing email host
+#EMAIL_HOST = 'smtp.my-company.com'
+#EMAIL_PORT = 25\\
+#EMAIL_HOST_USER = 'djangomail'
+#EMAIL_HOST_PASSWORD = 'top-secret!'
+
+# For multiple regions uncomment this configuration, and add (endpoint, title).
+#AVAILABLE_REGIONS = [
+# ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
+# ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
+#]
+
+OPENSTACK_KEYSTONE_URL = "{{ include "endpoint_keystone_internal" . }}"
+OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
+
+# Enables keystone web single-sign-on if set to True.
+#WEBSSO_ENABLED = False
+
+# Determines which authentication choice to show as default.
+#WEBSSO_INITIAL_CHOICE = "credentials"
+
+# The list of authentication mechanisms
+# which include keystone federation protocols.
+# Current supported protocol IDs are 'saml2' and 'oidc'
+# which represent SAML 2.0, OpenID Connect respectively.
+# Do not remove the mandatory credentials mechanism.
+#WEBSSO_CHOICES = (
+# ("credentials", _("Keystone Credentials")),
+# ("oidc", _("OpenID Connect")),
+# ("saml2", _("Security Assertion Markup Language")))
+
+# Disable SSL certificate checks (useful for self-signed certificates):
+#OPENSTACK_SSL_NO_VERIFY = True
+
+# The CA certificate to use to verify SSL connections
+#OPENSTACK_SSL_CACERT = '/path/to/cacert.pem'
+
+# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the
+# capabilities of the auth backend for Keystone.
+# If Keystone has been configured to use LDAP as the auth backend then set
+# can_edit_user to False and name to 'ldap'.
+#
+# TODO(tres): Remove these once Keystone has an API to identify auth backend.
+OPENSTACK_KEYSTONE_BACKEND = {
+ 'name': 'native',
+ 'can_edit_user': True,
+ 'can_edit_group': True,
+ 'can_edit_project': True,
+ 'can_edit_domain': True,
+ 'can_edit_role': True,
+}
+
+# Setting this to True, will add a new "Retrieve Password" action on instance,
+# allowing Admin session password retrieval/decryption.
+#OPENSTACK_ENABLE_PASSWORD_RETRIEVE = False
+
+# The Launch Instance user experience has been significantly enhanced.
+# You can choose whether to enable the new launch instance experience,
+# the legacy experience, or both. The legacy experience will be removed
+# in a future release, but is available as a temporary backup setting to ensure
+# compatibility with existing deployments. Further development will not be
+# done on the legacy experience. Please report any problems with the new
+# experience via the Launchpad tracking system.
+#
+# Toggle LAUNCH_INSTANCE_LEGACY_ENABLED and LAUNCH_INSTANCE_NG_ENABLED to
+# determine the experience to enable. Set them both to true to enable
+# both.
+#LAUNCH_INSTANCE_LEGACY_ENABLED = True
+#LAUNCH_INSTANCE_NG_ENABLED = False
+
+# The Xen Hypervisor has the ability to set the mount point for volumes
+# attached to instances (other Hypervisors currently do not). Setting
+# can_set_mount_point to True will add the option to set the mount point
+# from the UI.
+OPENSTACK_HYPERVISOR_FEATURES = {
+ 'can_set_mount_point': False,
+ 'can_set_password': False,
+}
+
+# The OPENSTACK_CINDER_FEATURES settings can be used to enable optional
+# services provided by cinder that is not exposed by its extension API.
+OPENSTACK_CINDER_FEATURES = {
+ 'enable_backup': False,
+}
+
+# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
+# services provided by neutron. Options currently available are load
+# balancer service, security groups, quotas, VPN service.
+OPENSTACK_NEUTRON_NETWORK = {
+ 'enable_router': True,
+ 'enable_quotas': True,
+ 'enable_ipv6': True,
+ 'enable_distributed_router': False,
+ 'enable_ha_router': False,
+ 'enable_lb': True,
+ 'enable_firewall': True,
+ 'enable_vpn': True,
+ 'enable_fip_topology_check': True,
+
+ # The profile_support option is used to detect if an external router can be
+ # configured via the dashboard. When using specific plugins the
+ # profile_support can be turned on if needed.
+ 'profile_support': None,
+ #'profile_support': 'cisco',
+
+ # Set which provider network types are supported. Only the network types
+ # in this list will be available to choose from when creating a network.
+ # Network types include local, flat, vlan, gre, and vxlan.
+ 'supported_provider_types': ['*'],
+
+ # Set which VNIC types are supported for port binding. Only the VNIC
+ # types in this list will be available to choose from when creating a
+ # port.
+ # VNIC types include 'normal', 'macvtap' and 'direct'.
+ 'supported_vnic_types': ['*']
+}
+
+# The OPENSTACK_IMAGE_BACKEND settings can be used to customize features
+# in the OpenStack Dashboard related to the Image service, such as the list
+# of supported image formats.
+#OPENSTACK_IMAGE_BACKEND = {
+# 'image_formats': [
+# ('', _('Select format')),
+# ('aki', _('AKI - Amazon Kernel Image')),
+# ('ami', _('AMI - Amazon Machine Image')),
+# ('ari', _('ARI - Amazon Ramdisk Image')),
+# ('docker', _('Docker')),
+# ('iso', _('ISO - Optical Disk Image')),
+# ('ova', _('OVA - Open Virtual Appliance')),
+# ('qcow2', _('QCOW2 - QEMU Emulator')),
+# ('raw', _('Raw')),
+# ('vdi', _('VDI - Virtual Disk Image')),
+# ('vhd', ('VHD - Virtual Hard Disk')),
+# ('vmdk', _('VMDK - Virtual Machine Disk')),
+# ]
+#}
+
+# The IMAGE_CUSTOM_PROPERTY_TITLES settings is used to customize the titles for
+# image custom property attributes that appear on image detail pages.
+IMAGE_CUSTOM_PROPERTY_TITLES = {
+ "architecture": _("Architecture"),
+ "kernel_id": _("Kernel ID"),
+ "ramdisk_id": _("Ramdisk ID"),
+ "image_state": _("Euca2ools state"),
+ "project_id": _("Project ID"),
+ "image_type": _("Image Type"),
+}
+
+# The IMAGE_RESERVED_CUSTOM_PROPERTIES setting is used to specify which image
+# custom properties should not be displayed in the Image Custom Properties
+# table.
+IMAGE_RESERVED_CUSTOM_PROPERTIES = []
+
+# OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
+# in the Keystone service catalog. Use this setting when Horizon is running
+# external to the OpenStack environment. The default is 'publicURL'.
+OPENSTACK_ENDPOINT_TYPE = "internalURL"
+
+# SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the
+# case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints
+# in the Keystone service catalog. Use this setting when Horizon is running
+# external to the OpenStack environment. The default is None. This
+# value should differ from OPENSTACK_ENDPOINT_TYPE if used.
+SECONDARY_ENDPOINT_TYPE = "publicURL"
+
+# The number of objects (Swift containers/objects or images) to display
+# on a single page before providing a paging element (a "more" link)
+# to paginate results.
+API_RESULT_LIMIT = 1000
+API_RESULT_PAGE_SIZE = 20
+
+# The size of chunk in bytes for downloading objects from Swift
+SWIFT_FILE_TRANSFER_CHUNK_SIZE = 512 * 1024
+
+# Specify a maximum number of items to display in a dropdown.
+DROPDOWN_MAX_ITEMS = 30
+
+# The timezone of the server. This should correspond with the timezone
+# of your entire OpenStack installation, and hopefully be in UTC.
+TIME_ZONE = "UTC"
+
+# When launching an instance, the menu of available flavors is
+# sorted by RAM usage, ascending. If you would like a different sort order,
+# you can provide another flavor attribute as sorting key. Alternatively, you
+# can provide a custom callback method to use for sorting. You can also provide
+# a flag for reverse sort. For more info, see
+# http://docs.python.org/2/library/functions.html#sorted
+#CREATE_INSTANCE_FLAVOR_SORT = {
+# 'key': 'name',
+# # or
+# 'key': my_awesome_callback_method,
+# 'reverse': False,
+#}
+
+# Set this to True to display an 'Admin Password' field on the Change Password
+# form to verify that it is indeed the admin logged-in who wants to change
+# the password.
+# ENFORCE_PASSWORD_CHECK = False
+
+# Modules that provide /auth routes that can be used to handle different types
+# of user authentication. Add auth plugins that require extra route handling to
+# this list.
+#AUTHENTICATION_URLS = [
+# 'openstack_auth.urls',
+#]
+
+# The Horizon Policy Enforcement engine uses these values to load per service
+# policy rule files. The content of these files should match the files the
+# OpenStack services are using to determine role based access control in the
+# target installation.
+
+# Path to directory containing policy.json files
+POLICY_FILES_PATH = '/etc/openstack-dashboard'
+# Map of local copy of service policy files
+#POLICY_FILES = {
+# 'identity': 'keystone_policy.json',
+# 'compute': 'nova_policy.json',
+# 'volume': 'cinder_policy.json',
+# 'image': 'glance_policy.json',
+# 'orchestration': 'heat_policy.json',
+# 'network': 'neutron_policy.json',
+# 'telemetry': 'ceilometer_policy.json',
+#}
+
+# Trove user and database extension support. By default support for
+# creating users and databases on database instances is turned on.
+# To disable these extensions set the permission here to something
+# unusable such as ["!"].
+# TROVE_ADD_USER_PERMS = []
+# TROVE_ADD_DATABASE_PERMS = []
+
+# Change this patch to the appropriate static directory containing
+# two files: _variables.scss and _styles.scss
+#CUSTOM_THEME_PATH = 'static/themes/default'
+
+LOGGING = {
+ 'version': 1,
+ # When set to True this will disable all logging except
+ # for loggers specified in this configuration dictionary. Note that
+ # if nothing is specified here and disable_existing_loggers is True,
+ # django.db.backends will still log unless it is disabled explicitly.
+ 'disable_existing_loggers': False,
+ 'handlers': {
+ 'null': {
+ 'level': 'DEBUG',
+ 'class': 'django.utils.log.NullHandler',
+ },
+ 'console': {
+ # Set the level to "DEBUG" for verbose output logging.
+ 'level': 'INFO',
+ 'class': 'logging.StreamHandler',
+ },
+ },
+ 'loggers': {
+ # Logging from django.db.backends is VERY verbose, send to null
+ # by default.
+ 'django.db.backends': {
+ 'handlers': ['null'],
+ 'propagate': False,
+ },
+ 'requests': {
+ 'handlers': ['null'],
+ 'propagate': False,
+ },
+ 'horizon': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'openstack_dashboard': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'novaclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'cinderclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'glanceclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'glanceclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'neutronclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'heatclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'ceilometerclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'troveclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'swiftclient': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'openstack_auth': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'nose.plugins.manager': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'django': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': False,
+ },
+ 'iso8601': {
+ 'handlers': ['null'],
+ 'propagate': False,
+ },
+ 'scss': {
+ 'handlers': ['null'],
+ 'propagate': False,
+ },
+ }
+}
+
+# 'direction' should not be specified for all_tcp/udp/icmp.
+# It is specified in the form.
+SECURITY_GROUP_RULES = {
+ 'all_tcp': {
+ 'name': _('All TCP'),
+ 'ip_protocol': 'tcp',
+ 'from_port': '1',
+ 'to_port': '65535',
+ },
+ 'all_udp': {
+ 'name': _('All UDP'),
+ 'ip_protocol': 'udp',
+ 'from_port': '1',
+ 'to_port': '65535',
+ },
+ 'all_icmp': {
+ 'name': _('All ICMP'),
+ 'ip_protocol': 'icmp',
+ 'from_port': '-1',
+ 'to_port': '-1',
+ },
+ 'ssh': {
+ 'name': 'SSH',
+ 'ip_protocol': 'tcp',
+ 'from_port': '22',
+ 'to_port': '22',
+ },
+ 'smtp': {
+ 'name': 'SMTP',
+ 'ip_protocol': 'tcp',
+ 'from_port': '25',
+ 'to_port': '25',
+ },
+ 'dns': {
+ 'name': 'DNS',
+ 'ip_protocol': 'tcp',
+ 'from_port': '53',
+ 'to_port': '53',
+ },
+ 'http': {
+ 'name': 'HTTP',
+ 'ip_protocol': 'tcp',
+ 'from_port': '80',
+ 'to_port': '80',
+ },
+ 'pop3': {
+ 'name': 'POP3',
+ 'ip_protocol': 'tcp',
+ 'from_port': '110',
+ 'to_port': '110',
+ },
+ 'imap': {
+ 'name': 'IMAP',
+ 'ip_protocol': 'tcp',
+ 'from_port': '143',
+ 'to_port': '143',
+ },
+ 'ldap': {
+ 'name': 'LDAP',
+ 'ip_protocol': 'tcp',
+ 'from_port': '389',
+ 'to_port': '389',
+ },
+ 'https': {
+ 'name': 'HTTPS',
+ 'ip_protocol': 'tcp',
+ 'from_port': '443',
+ 'to_port': '443',
+ },
+ 'smtps': {
+ 'name': 'SMTPS',
+ 'ip_protocol': 'tcp',
+ 'from_port': '465',
+ 'to_port': '465',
+ },
+ 'imaps': {
+ 'name': 'IMAPS',
+ 'ip_protocol': 'tcp',
+ 'from_port': '993',
+ 'to_port': '993',
+ },
+ 'pop3s': {
+ 'name': 'POP3S',
+ 'ip_protocol': 'tcp',
+ 'from_port': '995',
+ 'to_port': '995',
+ },
+ 'ms_sql': {
+ 'name': 'MS SQL',
+ 'ip_protocol': 'tcp',
+ 'from_port': '1433',
+ 'to_port': '1433',
+ },
+ 'mysql': {
+ 'name': 'MYSQL',
+ 'ip_protocol': 'tcp',
+ 'from_port': '3306',
+ 'to_port': '3306',
+ },
+ 'rdp': {
+ 'name': 'RDP',
+ 'ip_protocol': 'tcp',
+ 'from_port': '3389',
+ 'to_port': '3389',
+ },
+}
+
+# Deprecation Notice:
+#
+# The setting FLAVOR_EXTRA_KEYS has been deprecated.
+# Please load extra spec metadata into the Glance Metadata Definition Catalog.
+#
+# The sample quota definitions can be found in:
+# <glance_source>/etc/metadefs/compute-quota.json
+#
+# The metadata definition catalog supports CLI and API:
+# $glance --os-image-api-version 2 help md-namespace-import
+# $glance-manage db_load_metadefs <directory_with_definition_files>
+#
+# See Metadata Definitions on: http://docs.openstack.org/developer/glance/
+
+# Indicate to the Sahara data processing service whether or not
+# automatic floating IP allocation is in effect. If it is not
+# in effect, the user will be prompted to choose a floating IP
+# pool for use in their cluster. False by default. You would want
+# to set this to True if you were running Nova Networking with
+# auto_assign_floating_ip = True.
+#SAHARA_AUTO_IP_ALLOCATION_ENABLED = False
+
+# The hash algorithm to use for authentication tokens. This must
+# match the hash algorithm that the identity server and the
+# auth_token middleware are using. Allowed values are the
+# algorithms supported by Python's hashlib library.
+#OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5'
+
+# AngularJS requires some settings to be made available to
+# the client side. Some settings are required by in-tree / built-in horizon
+# features. These settings must be added to REST_API_REQUIRED_SETTINGS in the
+# form of ['SETTING_1','SETTING_2'], etc.
+#
+# You may remove settings from this list for security purposes, but do so at
+# the risk of breaking a built-in horizon feature. These settings are required
+# for horizon to function properly. Only remove them if you know what you
+# are doing. These settings may in the future be moved to be defined within
+# the enabled panel configuration.
+# You should not add settings to this list for out of tree extensions.
+# See: https://wiki.openstack.org/wiki/Horizon/RESTAPI
+REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES']
+
+# Additional settings can be made available to the client side for
+# extensibility by specifying them in REST_API_ADDITIONAL_SETTINGS
+# !! Please use extreme caution as the settings are transferred via HTTP/S
+# and are not encrypted on the browser. This is an experimental API and
+# may be deprecated in the future without notice.
+#REST_API_ADDITIONAL_SETTINGS = []
+
+# DISALLOW_IFRAME_EMBED can be used to prevent Horizon from being embedded
+# within an iframe. Legacy browsers are still vulnerable to a Cross-Frame
+# Scripting (XFS) vulnerability, so this option allows extra security hardening
+# where iframes are not used in deployment. Default setting is True.
+# For more information see:
+# http://tinyurl.com/anticlickjack
+# DISALLOW_IFRAME_EMBED = True
\ No newline at end of file
diff --git a/horizon/templates/service.yaml b/horizon/templates/service.yaml
new file mode 100644
index 0000000000..1c2fe3865a
--- /dev/null
+++ b/horizon/templates/service.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: horizon
+spec:
+ ports:
+ - port: {{ .Values.network.port }}
+ selector:
+ app: horizon
diff --git a/horizon/values.yaml b/horizon/values.yaml
new file mode 100644
index 0000000000..45570fd986
--- /dev/null
+++ b/horizon/values.yaml
@@ -0,0 +1,36 @@
+# Default values for memcached.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value
+
+replicas: 1
+
+images:
+ entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
+ horizon: quay.io/stackanetes/stackanetes-horizon:newton
+ pull_policy: "IfNotPresent"
+
+labels:
+ node_selector_key: openstack-control-plane
+ node_selector_value: enabled
+
+network:
+ port: 80
+
+local_settings:
+ horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
+ debug: "True"
+
+# typically overriden by environmental
+# values, but should include all endpoints
+# required by this chart
+endpoints:
+ keystone:
+ hosts:
+ default: keystone-api.openstack.cluster.local
+ path: /v2.0
+ type: identity
+ scheme: 'http'
+ port:
+ admin: 35356
+ public: 5000
From 42559457874839dd9544433e4a5d30f298536896 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Mon, 19 Dec 2016 15:40:53 -0800
Subject: [PATCH 2/6] Fix newline issues
---
common/templates/_endpoints.tpl | 3 ++-
common/values.yaml | 4 +++-
horizon/templates/bin/_start.sh.tpl | 3 ++-
horizon/templates/etc/_horizon.conf.tpl | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/common/templates/_endpoints.tpl b/common/templates/_endpoints.tpl
index 90f591e4d8..0170b4eb5c 100644
--- a/common/templates/_endpoints.tpl
+++ b/common/templates/_endpoints.tpl
@@ -5,4 +5,5 @@
{{- with .Values.endpoints.keystone -}}
{{.scheme}}://{{.hosts.internal | default .hosts.default}}:{{.port.public}}{{.path}}
{{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
diff --git a/common/values.yaml b/common/values.yaml
index 685d463e43..da62e63235 100644
--- a/common/values.yaml
+++ b/common/values.yaml
@@ -4,4 +4,6 @@
# name: value
global:
- fqdn_suffix: cluster.local
+ region: cluster
+ tld: local
+
diff --git a/horizon/templates/bin/_start.sh.tpl b/horizon/templates/bin/_start.sh.tpl
index 0741d29f74..75c5f9eb17 100644
--- a/horizon/templates/bin/_start.sh.tpl
+++ b/horizon/templates/bin/_start.sh.tpl
@@ -14,4 +14,5 @@ rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store
# wsgi/horizon-http needs open files here, including secret_key_store
chown -R horizon /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/
-apache2 -DFOREGROUND
\ No newline at end of file
+apache2 -DFOREGROUND
+
diff --git a/horizon/templates/etc/_horizon.conf.tpl b/horizon/templates/etc/_horizon.conf.tpl
index 74915f7ac9..aea2888f7a 100644
--- a/horizon/templates/etc/_horizon.conf.tpl
+++ b/horizon/templates/etc/_horizon.conf.tpl
@@ -19,4 +19,5 @@ Listen 0.0.0.0:{{ .Values.network.port}}
<Location "/static">
SetHandler None
</Location>
-</Virtualhost>
\ No newline at end of file
+</Virtualhost>
+
From 782eca43db03701a79fd16ce0023145a3d671666 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Mon, 19 Dec 2016 15:41:50 -0800
Subject: [PATCH 3/6] Revert unintended common/_hosts define rename
---
common/templates/_hosts.tpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/templates/_hosts.tpl b/common/templates/_hosts.tpl
index 275faed992..6655a88710 100644
--- a/common/templates/_hosts.tpl
+++ b/common/templates/_hosts.tpl
@@ -1,6 +1,6 @@
# fqdn
-{{- define "dns_region"}}cluster{{- end}}
-{{- define "dns_tld"}}local{{- end}}
+{{- define "region"}}cluster{{- end}}
+{{- define "tld"}}local{{- end}}
#-----------------------------------------
# hosts
From 60e2d4a6ccf19d3dc44a62a9f4c360b9bd536563 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 21 Dec 2016 05:51:44 -0800
Subject: [PATCH 4/6] Update job dependency method to match existing pattern
This also moves joinWithColon to common, so a subsequent commit should remove
the _helpers.tpl template from charts which include common as a dependency.
---
common/templates/_funcs.tpl | 4 ++++
horizon/templates/deployment.yaml | 2 +-
horizon/values.yaml | 7 +++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/common/templates/_funcs.tpl b/common/templates/_funcs.tpl
index 87646f8cb2..86c2bd3057 100644
--- a/common/templates/_funcs.tpl
+++ b/common/templates/_funcs.tpl
@@ -1,3 +1,7 @@
+{{- define "joinListWithColon" -}}
+{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }}
+{{- end -}}
+
{{- define "template" -}}
{{- $name := index . 0 -}}
{{- $context := index . 1 -}}
diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
index cb78e70b53..76b6288acb 100644
--- a/horizon/templates/deployment.yaml
+++ b/horizon/templates/deployment.yaml
@@ -21,7 +21,7 @@ spec:
},
{
"name": "DEPENDENCY_SERVICE",
- "value": "memcached,keystone-api"
+ "value": "{{ include "joinListWithColon" .Values.dependencies.dashboard.service }}"
},
{
"name": "COMMAND",
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 45570fd986..be34ef7f84 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -21,6 +21,12 @@ local_settings:
horizon_secret_key: 9aee62c0-5253-4a86-b189-e0fb71fa503c
debug: "True"
+dependencies:
+ dashboard:
+ service:
+ - memcached
+ - keystone-api
+
# typically overriden by environmental
# values, but should include all endpoints
# required by this chart
@@ -34,3 +40,4 @@ endpoints:
port:
admin: 35356
public: 5000
+
From e85f080b3f96d7b19dfdf9ddc1ec3e2197fe1122 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 21 Dec 2016 05:53:31 -0800
Subject: [PATCH 5/6] Ensure default for keystone endpoint is agnostic of
namespace
---
horizon/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/horizon/values.yaml b/horizon/values.yaml
index be34ef7f84..f1dd9a1aa9 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -33,7 +33,7 @@ dependencies:
endpoints:
keystone:
hosts:
- default: keystone-api.openstack.cluster.local
+ default: keystone-api
path: /v2.0
type: identity
scheme: 'http'
From ca2dd29bbd88f00e03b4ee49d713aa28bb17426e Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 21 Dec 2016 09:58:13 -0800
Subject: [PATCH 6/6] Add configmap hashing approach to horizon to allow
rolling updates when configmaps are updated
---
common/templates/_funcs.tpl | 11 +++++++++++
horizon/templates/deployment.yaml | 2 ++
2 files changed, 13 insertions(+)
diff --git a/common/templates/_funcs.tpl b/common/templates/_funcs.tpl
index 86c2bd3057..e83d171a97 100644
--- a/common/templates/_funcs.tpl
+++ b/common/templates/_funcs.tpl
@@ -11,3 +11,14 @@
{{- $wtf := $context.Template.Name | replace $last $name -}}
{{ include $wtf $context }}
{{- end -}}
+
+{{- define "hash" -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $v:= $context.Template.Name | split "/" -}}
+{{- $n := len $v -}}
+{{- $last := sub $n 1 | printf "_%d" | index $v -}}
+{{- $wtf := $context.Template.Name | replace $last $name -}}
+{{- include $wtf $context | sha256sum | quote -}}
+{{- end -}}
+
diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
index 76b6288acb..2baa6bc36f 100644
--- a/horizon/templates/deployment.yaml
+++ b/horizon/templates/deployment.yaml
@@ -9,6 +9,8 @@ spec:
labels:
app: horizon
annotations:
+ configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
+ configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",