summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-27 12:11:13 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-10 10:55:33 +0000
commitedb1cb9efcefe38034f92c832a6079aad00f45a9 (patch)
tree998475deda080a9157ed95f67482413be04ca218
parent6c68bd3b81cd05dac0f829da6682de428c55092a (diff)
downloaddefinitions-edb1cb9efcefe38034f92c832a6079aad00f45a9.tar.gz
nova: Move templates to /usr/share/openstack/nova
Also change placeholders to jinja2 type
-rw-r--r--openstack/usr/share/openstack/nova/api-paste.ini (renamed from openstack/etc/nova/api-paste.ini)0
-rw-r--r--openstack/usr/share/openstack/nova/cells.json (renamed from openstack/etc/nova/cells.json)0
-rw-r--r--openstack/usr/share/openstack/nova/logging.conf (renamed from openstack/etc/nova/logging.conf)0
-rw-r--r--openstack/usr/share/openstack/nova/nova-compute.conf (renamed from openstack/etc/nova/nova-compute.conf)2
-rw-r--r--openstack/usr/share/openstack/nova/nova.conf (renamed from openstack/etc/nova/nova.conf)42
-rw-r--r--openstack/usr/share/openstack/nova/nova.conf.example (renamed from openstack/etc/nova/nova.conf.example)0
-rw-r--r--openstack/usr/share/openstack/nova/policy.json (renamed from openstack/etc/nova/policy.json)0
-rw-r--r--openstack/usr/share/openstack/nova/release.sample (renamed from openstack/etc/nova/release.sample)0
8 files changed, 22 insertions, 22 deletions
diff --git a/openstack/etc/nova/api-paste.ini b/openstack/usr/share/openstack/nova/api-paste.ini
index 2a825a5b..2a825a5b 100644
--- a/openstack/etc/nova/api-paste.ini
+++ b/openstack/usr/share/openstack/nova/api-paste.ini
diff --git a/openstack/etc/nova/cells.json b/openstack/usr/share/openstack/nova/cells.json
index cc74930d..cc74930d 100644
--- a/openstack/etc/nova/cells.json
+++ b/openstack/usr/share/openstack/nova/cells.json
diff --git a/openstack/etc/nova/logging.conf b/openstack/usr/share/openstack/nova/logging.conf
index 5482a040..5482a040 100644
--- a/openstack/etc/nova/logging.conf
+++ b/openstack/usr/share/openstack/nova/logging.conf
diff --git a/openstack/etc/nova/nova-compute.conf b/openstack/usr/share/openstack/nova/nova-compute.conf
index 1ef5590c..b19de1d3 100644
--- a/openstack/etc/nova/nova-compute.conf
+++ b/openstack/usr/share/openstack/nova/nova-compute.conf
@@ -1,4 +1,4 @@
[DEFAULT]
compute_driver=libvirt.LibvirtDriver
[libvirt]
-virt_type=qemu
+virt_type={{ NOVA_VIRT_TYPE }}
diff --git a/openstack/etc/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf
index ca009273..cc90674d 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/usr/share/openstack/nova/nova.conf
@@ -54,7 +54,7 @@ logdir=/var/log/nova
# Mandatory general options #
#############################
# ip address of this host (string value)
-my_ip=##NOVA_HOST##
+my_ip={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
#use_ipv6=false
@@ -181,12 +181,12 @@ scheduler_default_filters=AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilt
############
# RABBITMQ #
############
-rabbit_host = ##RABBITMQ_HOST##
+rabbit_host = {{ RABBITMQ_HOST }}
#fake_rabbit=false
#rabbit_virtual_host=/
-rabbit_userid = ##RABBITMQ_USER##
-rabbit_password = ##RABBITMQ_PASSWORD##
-rabbit_port = ##RABBITMQ_PORT##
+rabbit_userid = {{ RABBITMQ_USER }}
+rabbit_password = {{ RABBITMQ_PASSWORD }}
+rabbit_port = {{ RABBITMQ_PORT }}
rabbit_use_ssl=false
#rabbit_retry_interval=1
# The messaging module to use, defaults to kombu (works for rabbit).
@@ -196,9 +196,9 @@ rpc_backend = nova.openstack.common.rpc.impl_kombu
##########
# GLANCE #
##########
-host=##GLANCE_HOST##
-port=9292
-protocol=http
+glance_host={{ CONTROLLER_HOST_ADDRESS }}
+glance_port=9292
+glance_protocol=http
# A list of the glance api servers available to nova. Prefix
# with https:// for ssl-based glance api servers.
@@ -281,13 +281,13 @@ flat_interface=eth0
# Neutron #
###########
# This is the URL of your neutron server:
-neutron_url=##NEUTRON_PUBLIC_URL##
+neutron_url = http://{{ CONTROLLER_HOST_ADDRESS }}:9696
neutron_auth_strategy=keystone
neutron_admin_tenant_name=service
-neutron_admin_username=##NEUTRON_SERVICE_USER##
-neutron_admin_password=##NEUTRON_SERVICE_PASSWORD##
+neutron_admin_username={{ NEUTRON_SERVICE_USER }}
+neutron_admin_password={{ NEUTRON_SERVICE_PASSWORD }}
# This is the URL of your Keystone server
-neutron_admin_auth_url=##KEYSTONE_ADMIN_URL##
+neutron_admin_auth_url=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
# What's below is only needed for nova-compute.
@@ -300,7 +300,7 @@ service_neutron_metadata_proxy=True
# Shared secret to validate proxies Neutron metadata requests
# This password should match what is in /etc/neutron/metadata_agent.ini
# (string value)
-neutron_metadata_proxy_shared_secret= ##METADATA_PROXY_SHARED_SECRET##
+neutron_metadata_proxy_shared_secret= {{ METADATA_PROXY_SHARED_SECRET }}
#################
# NOVNC CONSOLE #
@@ -319,9 +319,9 @@ neutron_metadata_proxy_shared_secret= ##METADATA_PROXY_SHARED_SECRET##
# horizon machine can resolve this alias as the compute node ip.
#
vnc_enabled=True
-novncproxy_base_url=##NOVA_NOVNCPROXY_BASE_URL##
+novncproxy_base_url=http://{{ CONTROLLER_HOST_ADDRESS }}:6080/vnc_auto.html
# Change vncserver_proxyclient_address and vncserver_listen to match each compute host
-vncserver_proxyclient_address=##NOVNC_HOST##
+vncserver_proxyclient_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
vncserver_listen=0.0.0.0
vnc_keymap="en-us"
@@ -370,7 +370,7 @@ vnc_keymap="en-us"
# DATABASE #
############
[database]
-connection=postgresql://##NOVA_DB_USER##:##NOVA_DB_PASSWORD##@onenode/nova
+connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/nova
#############
# CONDUCTOR #
@@ -607,13 +607,13 @@ enabled=false
# Keystone authtoken #
######################
[keystone_authtoken]
-identity_uri = ##IDENTITY_URI##
-auth_uri = ##KEYSTONE_INTERNAL_URL##
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
auth_port = 35357
auth_protocol = http
admin_tenant_name = service
-admin_user = ##NOVA_SERVICE_USER##
-admin_password = ##NOVA_SERVICE_PASSWORD##
+admin_user = {{ NOVA_SERVICE_USER }}
+admin_password = {{ NOVA_SERVICE_PASSWORD }}
auth_version = v2.0
###########
@@ -633,7 +633,7 @@ allow_resize_to_same_host=True
[libvirt]
# Actual testing hardware does not support hardware acceleration
# so in this step we will configure libvirt to use qemu instead of KVM
-virt_type=qemu
+virt_type={{ NOVA_VIRT_TYPE }}
##################
# SERIAL CONSOLE #
diff --git a/openstack/etc/nova/nova.conf.example b/openstack/usr/share/openstack/nova/nova.conf.example
index 999574ca..999574ca 100644
--- a/openstack/etc/nova/nova.conf.example
+++ b/openstack/usr/share/openstack/nova/nova.conf.example
diff --git a/openstack/etc/nova/policy.json b/openstack/usr/share/openstack/nova/policy.json
index cc5b8ea4..cc5b8ea4 100644
--- a/openstack/etc/nova/policy.json
+++ b/openstack/usr/share/openstack/nova/policy.json
diff --git a/openstack/etc/nova/release.sample b/openstack/usr/share/openstack/nova/release.sample
index 4c0d8e48..4c0d8e48 100644
--- a/openstack/etc/nova/release.sample
+++ b/openstack/usr/share/openstack/nova/release.sample