openstack/openstack-helm
Code Issues Proposed changes

Merge "Nova: remove oslo-genconfig"

Browse Source
This commit is contained in:
Jenkins 2017-09-22 14:27:52 +00:00 committed by Gerrit Code Review
commit f3e16dae18
7 changed files with 154 additions and 10684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/templates/bin/_nova-vnc-compute-init.sh.tpl
View File

@ -18,7 +18,7 @@ limitations under the License.
set -ex set -ex
client_address="{{- .Values.conf.nova.vnc.nova.conf.vncserver_proxyclient_address -}}" client_address="{{- .Values.conf.nova.vnc.vncserver_proxyclient_address -}}"
if [ -z "${client_address}" ] ; then if [ -z "${client_address}" ] ; then
client_interface="{{- .Values.console.novnc.compute.vncserver_proxyclient_interface -}}" client_interface="{{- .Values.console.novnc.compute.vncserver_proxyclient_interface -}}"
if [ -z "${client_interface}" ] ; then if [ -z "${client_interface}" ] ; then
@ -30,7 +30,7 @@ if [ -z "${client_address}" ] ; then
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}') client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}')
fi fi
listen_ip="{{- .Values.conf.nova.vnc.nova.conf.vncserver_listen -}}" listen_ip="{{- .Values.conf.nova.vnc.vncserver_listen -}}"
if [ -z "${listen_ip}" ] ; then if [ -z "${listen_ip}" ] ; then
# The server component listens on all IP addresses and the proxy component # The server component listens on all IP addresses and the proxy component
# only listens on the management interface IP address of the compute node. # only listens on the management interface IP address of the compute node.

4
nova/templates/bin/_nova-vnc-proxy-init.sh.tpl
View File

@ -18,7 +18,7 @@ limitations under the License.
set -ex set -ex
client_address="{{- .Values.conf.nova.vnc.vncproxy.conf.vncserver_proxyclient_address -}}" client_address="{{- .Values.conf.nova.vnc.vncserver_proxyclient_address -}}"
if [ -z "${client_address}" ] ; then if [ -z "${client_address}" ] ; then
client_interface="{{- .Values.console.novnc.vncproxy.vncserver_proxyclient_interface -}}" client_interface="{{- .Values.console.novnc.vncproxy.vncserver_proxyclient_interface -}}"
if [ -z "${client_interface}" ] ; then if [ -z "${client_interface}" ] ; then
@ -30,7 +30,7 @@ if [ -z "${client_address}" ] ; then
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}') client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}')
fi fi
listen_ip="{{- .Values.conf.nova.vnc.vncproxy.conf.vncserver_listen -}}" listen_ip="{{- .Values.conf.nova.vnc.vncserver_listen -}}"
if [ -z "${listen_ip}" ] ; then if [ -z "${listen_ip}" ] ; then
listen_ip=$client_address listen_ip=$client_address
fi fi

86
nova/templates/configmap-etc.yaml
View File

@ -17,79 +17,77 @@ limitations under the License.
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }} {{- $envAll := . }}
{{- include "nova.conf.nova_values_skeleton" .Values.conf.nova | trunc 0 -}} {{- if empty .Values.conf.nova.keystone_authtoken.auth_uri -}}
{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken "auth_uri" | quote | trunc 0 -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.auth_uri -}}
{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_uri" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
# FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.auth_url -}} {{- if empty .Values.conf.nova.keystone_authtoken.auth_url -}}
{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "auth_url" | quote | trunc 0 -}} {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken "auth_url" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
# Set a random string as secret key. # Set a random string as secret key.
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.memcache_secret_key -}} {{- if empty .Values.conf.nova.keystone_authtoken.memcache_secret_key -}}
{{- randAlphaNum 64 | set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "memcache_secret_key" | quote | trunc 0 -}} {{- randAlphaNum 64 | set .Values.conf.nova.keystone_authtoken "memcache_secret_key" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.region_name -}} {{- if empty .Values.conf.nova.keystone_authtoken.region_name -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "region_name" .Values.endpoints.identity.auth.user.region_name | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.project_name -}} {{- if empty .Values.conf.nova.keystone_authtoken.project_name -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "project_name" .Values.endpoints.identity.auth.user.project_name | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.project_domain_name -}} {{- if empty .Values.conf.nova.keystone_authtoken.project_domain_name -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.user.project_domain_name | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.user_domain_name -}} {{- if empty .Values.conf.nova.keystone_authtoken.user_domain_name -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.user.user_domain_name | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.username -}} {{- if empty .Values.conf.nova.keystone_authtoken.username -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "username" .Values.endpoints.identity.auth.user.username | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.password -}} {{- if empty .Values.conf.nova.keystone_authtoken.password -}}
{{- set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}} {{- set .Values.conf.nova.keystone_authtoken "password" .Values.endpoints.identity.auth.user.password | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token.memcached_servers -}} {{- if empty .Values.conf.nova.keystone_authtoken.memcached_servers -}}
{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken.keystonemiddleware.auth_token "memcached_servers" | quote | trunc 0 -}} {{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "memcached_servers" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.database.oslo.db.connection -}} {{- if empty .Values.conf.nova.database.connection -}}
{{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.database.oslo.db "connection" | quote | trunc 0 -}} {{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.database "connection" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.api_database.nova.conf.connection -}} {{- if empty .Values.conf.nova.api_database.connection -}}
{{- tuple "oslo_db_api" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.api_database.nova.conf "connection" | quote | trunc 0 -}} {{- tuple "oslo_db_api" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.nova.api_database "connection" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.default.oslo.messaging.transport_url -}} {{- if empty .Values.conf.nova.DEFAULT.transport_url -}}
{{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.default.oslo.messaging "transport_url" | quote | trunc 0 -}} {{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.DEFAULT "transport_url" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.glance.nova.conf.api_servers -}} {{- if empty .Values.conf.nova.glance.api_servers -}}
{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.glance.nova.conf "api_servers" | quote | trunc 0 -}} {{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.glance "api_servers" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.neutron.nova.conf.url -}} {{- if empty .Values.conf.nova.neutron.url -}}
{{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "url" | quote | trunc 0 -}} {{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron "url" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.neutron.nova.conf.auth_url -}} {{- if empty .Values.conf.nova.neutron.auth_url -}}
{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron.nova.conf "auth_url" | quote | trunc 0 -}} {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron "auth_url" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.cache.nova.conf.memcache_servers -}} {{- if empty .Values.conf.nova.cache.memcache_servers -}}
{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache.nova.conf "memcache_servers" | quote | trunc 0 -}} {{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache "memcache_servers" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.default.nova.conf.metadata_host -}} {{- if empty .Values.conf.nova.DEFAULT.metadata_host -}}
{{- set .Values.conf.nova.default.nova.conf "metadata_host" .Values.network.metadata.ip | quote | trunc 0 -}} {{- set .Values.conf.nova.DEFAULT "metadata_host" .Values.network.metadata.ip | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.default.nova.conf.metadata_port -}} {{- if empty .Values.conf.nova.DEFAULT.metadata_port -}}
{{- tuple "compute_metadata" "public" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.default.nova.conf "metadata_port" | quote | trunc 0 -}} {{- tuple "compute_metadata" "public" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "metadata_port" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
--- ---
@ -100,12 +98,10 @@ metadata:
data: data:
rally_tests.yaml: |+ rally_tests.yaml: |+
{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
nova.conf: |+
{{- tuple .Values.conf.nova "etc/_nova.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
api-paste.ini: |+ api-paste.ini: |+
{{- tuple .Values.conf.paste "etc/_api-paste.ini.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | indent 4 }}
policy.yaml: |+ policy.yaml: |+
{{ toYaml .Values.conf.policy | indent 4 }} {{ toYaml .Values.conf.policy | indent 4 }}
nova_sudoers: |+ nova_sudoers: |+
{{- tuple .Values.conf.neutron_sudoers "etc/_nova_sudoers.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- tuple .Values.conf.neutron_sudoers "etc/_nova_sudoers.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
rootwrap.conf: |+ rootwrap.conf: |+
@ -116,4 +112,6 @@ data:
{{- tuple .Values.conf.rootwrap_filters.compute "etc/rootwrap.d/_compute.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- tuple .Values.conf.rootwrap_filters.compute "etc/rootwrap.d/_compute.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
network.filters: |+ network.filters: |+
{{- tuple .Values.conf.rootwrap_filters.network "etc/rootwrap.d/_network.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }} {{- tuple .Values.conf.rootwrap_filters.network "etc/rootwrap.d/_network.filters.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
nova.conf: |+
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | indent 4 }}
{{- end }} {{- end }}

81
nova/templates/etc/_api-paste.ini.tpl
View File

@ -1,81 +0,0 @@
############
# Metadata #
############
[composite:metadata]
use = egg:Paste#urlmap
/: meta
[pipeline:meta]
pipeline = cors metaapp
[app:metaapp]
paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
#############
# OpenStack #
#############
[composite:osapi_compute]
use = call:nova.api.openstack.urlmap:urlmap_factory
/: oscomputeversions
# v21 is an exactly feature match for v2, except it has more stringent
# input validation on the wsgi surface (prevents fuzzing early on the
# API). It also provides new features via API microversions which are
# opt into for clients. Unaware clients will receive the same frozen
# v2 API feature set, but with some relaxed validation
/v2: openstack_compute_api_v21_legacy_v2_compatible
/v2.1: openstack_compute_api_v21
[composite:openstack_compute_api_v21]
use = call:nova.api.auth:pipeline_factory_v21
noauth2 = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
keystone = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
[composite:openstack_compute_api_v21_legacy_v2_compatible]
use = call:nova.api.auth:pipeline_factory_v21
noauth2 = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 legacy_v2_compatible osapi_compute_app_v21
keystone = cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_v2_compatible osapi_compute_app_v21
[filter:request_id]
paste.filter_factory = oslo_middleware:RequestId.factory
[filter:compute_req_id]
paste.filter_factory = nova.api.compute_req_id:ComputeReqIdMiddleware.factory
[filter:faultwrap]
paste.filter_factory = nova.api.openstack:FaultWrapper.factory
[filter:noauth2]
paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
[filter:sizelimit]
paste.filter_factory = oslo_middleware:RequestBodySizeLimiter.factory
[filter:http_proxy_to_wsgi]
paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
[filter:legacy_v2_compatible]
paste.filter_factory = nova.api.openstack:LegacyV2CompatibleWrapper.factory
[app:osapi_compute_app_v21]
paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory
[pipeline:oscomputeversions]
pipeline = faultwrap http_proxy_to_wsgi oscomputeversionapp
[app:oscomputeversionapp]
paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
##########
# Shared #
##########
[filter:cors]
paste.filter_factory = oslo_middleware.cors:filter_factory
oslo_config_project = nova
[filter:keystonecontext]
paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
[filter:authtoken]
paste.filter_factory = keystonemiddleware.auth_token:filter_factory

10451
nova/templates/etc/_nova.conf.tpl
View File

File diff suppressed because it is too large Load Diff

204
nova/values.yaml
View File

@ -261,8 +261,53 @@ conf:
override: override:
append: append:
paste: paste:
override: composite:metadata:
append: use: egg:Paste#urlmap
/: meta
pipeline:meta:
pipeline: cors metaapp
app:metaapp:
paste.app_factory: nova.api.metadata.handler:MetadataRequestHandler.factory
composite:osapi_compute:
use: call:nova.api.openstack.urlmap:urlmap_factory
/: oscomputeversions
/v2: openstack_compute_api_v21_legacy_v2_compatible
/v2.1: openstack_compute_api_v21
composite:openstack_compute_api_v21:
use: call:nova.api.auth:pipeline_factory_v21
noauth2: cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
keystone: cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
composite:openstack_compute_api_v21_legacy_v2_compatible:
use: call:nova.api.auth:pipeline_factory_v21
noauth2: cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 legacy_v2_compatible osapi_compute_app_v21
keystone: cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_v2_compatible osapi_compute_app_v21
filter:request_id:
paste.filter_factory: oslo_middleware:RequestId.factory
filter:compute_req_id:
paste.filter_factory: nova.api.compute_req_id:ComputeReqIdMiddleware.factory
filter:faultwrap:
paste.filter_factory: nova.api.openstack:FaultWrapper.factory
filter:noauth2:
paste.filter_factory: nova.api.openstack.auth:NoAuthMiddleware.factory
filter:sizelimit:
paste.filter_factory: oslo_middleware:RequestBodySizeLimiter.factory
filter:http_proxy_to_wsgi:
paste.filter_factory: oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
filter:legacy_v2_compatible:
paste.filter_factory: nova.api.openstack:LegacyV2CompatibleWrapper.factory
app:osapi_compute_app_v21:
paste.app_factory: nova.api.openstack.compute:APIRouterV21.factory
pipeline:oscomputeversions:
pipeline: faultwrap http_proxy_to_wsgi oscomputeversionapp
app:oscomputeversionapp:
paste.app_factory: nova.api.openstack.compute.versions:Versions.factory
filter:cors:
paste.filter_factory: oslo_middleware.cors:filter_factory
oslo_config_project: nova
filter:keystonecontext:
paste.filter_factory: nova.api.auth:NovaKeystoneContext.factory
filter:authtoken:
paste.filter_factory: keystonemiddleware.auth_token:filter_factory
policy: policy:
os_compute_api:os-admin-actions:discoverable: "@" os_compute_api:os-admin-actions:discoverable: "@"
os_compute_api:os-admin-actions:reset_state: rule:admin_api os_compute_api:os-admin-actions:reset_state: rule:admin_api
@ -538,119 +583,78 @@ conf:
override: override:
append: append:
nova: nova:
override: DEFAULT:
append: default_ephemeral_format: ext4
default: ram_allocation_ratio: 1.0
nova: disk_allocation_ratio: 1.0
conf: cpu_allocation_ratio: 3.0
default_ephemeral_format: ext4 force_config_drive: true
ram_allocation_ratio: 1.0 state_path: /var/lib/nova
disk_allocation_ratio: 1.0 osapi_compute_listen: 0.0.0.0
cpu_allocation_ratio: 3.0 osapi_compute_listen_port: 8774
force_config_drive: true osapi_compute_workers: 1
state_path: /var/lib/nova metadata_workers: 1
osapi_compute_listen: 0.0.0.0 use_neutron: true
osapi_compute_listen_port: 8774 firewall_driver: nova.virt.firewall.NoopFirewallDriver
osapi_compute_workers: 1 linuxnet_interface_driver: openvswitch
metadata_workers: 1 allow_resize_to_same_host: true
use_neutron: true compute_driver: libvirt.LibvirtDriver
firewall_driver: nova.virt.firewall.NoopFirewallDriver my_ip: 0.0.0.0
linuxnet_interface_driver: openvswitch
allow_resize_to_same_host: true
compute_driver: libvirt.LibvirtDriver
my_ip: 0.0.0.0
spice:
serial:
vnc: vnc:
nova: novncproxy_host: 0.0.0.0
conf: novncproxy_port: 6080
novncproxy_host: 0.0.0.0 vncserver_listen: 0.0.0.0
novncproxy_port: 6080 # leave blank, this should be set by each compute nodes's ip
vncserver_listen: 0.0.0.0 vncserver_proxyclient_address: null
# leave blank, this should be set by each compute nodes's ip # set management or lb address
vncserver_proxyclient_address: novncproxy_base_url: http://nova-novncproxy:6080/vnc_auto.html
# set management or lb address
novncproxy_base_url: http://nova-novncproxy:6080/vnc_auto.html
vncproxy:
conf:
# IF blank, search default routing interface's ip
vncserver_listen:
vncserver_proxyclient_address:
conductor: conductor:
nova: workers: 1
conf:
workers: 1
oslo_policy: oslo_policy:
oslo: policy_file: /etc/nova/policy.yaml
policy:
policy_file: /etc/nova/policy.yaml
oslo_concurrency: oslo_concurrency:
oslo: lock_path: /var/lib/nova/tmp
concurrency:
lock_path: /var/lib/nova/tmp
oslo_middleware: oslo_middleware:
oslo: enable_proxy_headers_parsing: true
middleware:
enable_proxy_headers_parsing: true
glance: glance:
nova: num_retries: 3
conf:
num_retries: 3
cinder: cinder:
nova: catalog_info: volumev2:cinder:internalURL
conf:
catalog_info: volumev2:cinder:internalURL
neutron: neutron:
nova: metadata_proxy_shared_secret: "password"
conf: service_metadata_proxy: True
metadata_proxy_shared_secret: "password" auth_type: password
service_metadata_proxy: True auth_version: v3
auth_type: password region_name: RegionOne
auth_version: v3 project_name: service
region_name: RegionOne project_domain_name: default
project_name: service user_domain_name: default
project_domain_name: default username: neutron
user_domain_name: default password: password
username: neutron
password: password
database: database:
oslo: max_retries: -1
db:
max_retries: -1
api_database: api_database:
oslo: max_retries: -1
db:
max_retries: -1
keystone_authtoken: keystone_authtoken:
keystonemiddleware: auth_type: password
auth_token: auth_version: v3
auth_type: password memcache_security_strategy: ENCRYPT
auth_version: v3
memcache_security_strategy: ENCRYPT
libvirt: libvirt:
nova: connection_uri: "qemu+tcp://127.0.0.1/system"
conf: images_type: qcow2
connection_uri: "qemu+tcp://127.0.0.1/system" images_rbd_pool: vms
images_type: qcow2 images_rbd_ceph_conf: /etc/ceph/ceph.conf
images_rbd_pool: vms rbd_user: admin
images_rbd_ceph_conf: /etc/ceph/ceph.conf rbd_secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
rbd_user: admin disk_cachemodes: "network=writeback"
rbd_secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337 hw_disk_discard: unmap
disk_cachemodes: "network=writeback"
hw_disk_discard: unmap
upgrade_levels: upgrade_levels:
nova: compute: auto
conf:
compute: auto
cache: cache:
nova: enabled: true
conf: backend: oslo_cache.memcache_pool
enabled: true
backend: oslo_cache.memcache_pool
wsgi: wsgi:
nova: api_paste_config: /etc/nova/api-paste.ini
conf:
api_paste_config: /etc/nova/api-paste.ini
# Names of secrets used by bootstrap and environmental checks # Names of secrets used by bootstrap and environmental checks
secrets: secrets:

8
tools/gate/launch-osh/basic.sh
View File

@ -139,7 +139,7 @@ kube_wait_for_pods openstack ${POD_START_TIMEOUT_OPENSTACK}
if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--set conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
@ -147,7 +147,7 @@ if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \ --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
--set conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
@ -155,7 +155,7 @@ elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--set dependencies.compute.daemonset={neutron-lb-agent} \ --set dependencies.compute.daemonset={neutron-lb-agent} \
--set conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
@ -163,7 +163,7 @@ elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; the
elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \ --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
--set conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml