From 878c6ff1e5f19136428271ff8e4ab854c4aa28e9 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 16 Mar 2015 12:05:37 +0000
Subject: neutron: Change templates to jinja2 type

---
 .../usr/share/openstack/neutron/metadata_agent.ini | 10 ++++----
 openstack/usr/share/openstack/neutron/neutron.conf | 28 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/openstack/usr/share/openstack/neutron/metadata_agent.ini b/openstack/usr/share/openstack/neutron/metadata_agent.ini
index 688dbbc5..9ce3ab46 100644
--- a/openstack/usr/share/openstack/neutron/metadata_agent.ini
+++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini
@@ -4,21 +4,21 @@ debug = True
 verbose = True
  
 # The Neutron user information for accessing the Neutron API.
-auth_url = ##KEYSTONE_INTERNAL_URL##
+auth_url = {{ KEYSTONE_INTERNAL_URL }}
 auth_region = regionOne
 # Turn off verification of the certificate for ssl
 # auth_insecure = False
 # Certificate Authority public key (CA cert) file for ssl
 # auth_ca_cert =
 admin_tenant_name = service
-admin_user = ##NEUTRON_SERVICE_USER##
-admin_password = ##NEUTRON_SERVICE_PASSWORD##
+admin_user = {{ NEUTRON_SERVICE_USER }}
+admin_password = {{ NEUTRON_SERVICE_PASSWORD }}
  
 # Network service endpoint type to pull from the keystone catalog
 # endpoint_type = adminURL
  
 # IP address used by Nova metadata server
-nova_metadata_ip = ##NOVA_HOST##
+nova_metadata_ip = {{ NOVA_HOST }}
  
 # TCP Port used by Nova metadata server
 # nova_metadata_port = 8775
@@ -41,7 +41,7 @@ nova_metadata_ip = ##NOVA_HOST##
 # shared secret to prevent spoofing.  You may select any string for a secret,
 # but it must match here and in the configuration used by the Nova Metadata
 # Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret
-metadata_proxy_shared_secret = ##METADATA_PROXY_SHARED_SECRET##
+metadata_proxy_shared_secret = {{ METADATA_PROXY_SHARED_SECRET }}
  
 # Location of Metadata Proxy UNIX domain socket
 # metadata_proxy_socket = $state_path/metadata_proxy
diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf
index 1e832ccd..fea0d476 100644
--- a/openstack/usr/share/openstack/neutron/neutron.conf
+++ b/openstack/usr/share/openstack/neutron/neutron.conf
@@ -246,19 +246,19 @@ notify_nova_on_port_data_changes = True
 nova_url = http://onenode:8774/v2
  
 # Name of nova region to use. Useful if keystone manages more than one region
-nova_region_name = ##NOVA_REGION##
+nova_region_name = {{ NOVA_REGION }}
  
 # Username for connection to nova in admin context
-nova_admin_username = ##NOVA_SERVICE_USER##
+nova_admin_username = {{ NOVA_SERVICE_USER }}
  
 # The uuid of the admin nova tenant
-nova_admin_tenant_id = ##SERVICE_TENANT_ID##
+nova_admin_tenant_id = {{ SERVICE_TENANT_ID }}
  
 # Password for connection to nova in admin context.
-nova_admin_password = ##NOVA_SERVICE_PASSWORD##
+nova_admin_password = {{ NOVA_SERVICE_PASSWORD }}
  
 # Authorization URL for connection to nova in admin context.
-nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
+nova_admin_auth_url = {{ KEYSTONE_ADMIN_URL }}
  
 # CA file for novaclient to verify server certificates
 # nova_ca_certificates_file =
@@ -343,11 +343,11 @@ nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
  
 # The RabbitMQ broker address where a single node is used.
 # (string value)
-rabbit_host=##RABBITMQ_HOST##
+rabbit_host={{ RABBITMQ_HOST }}
  
 # The RabbitMQ broker port where a single node is used.
 # (integer value)
-rabbit_port=##RABBITMQ_PORT##
+rabbit_port={{ RABBITMQ_PORT }}
  
 # RabbitMQ HA cluster host:port pairs. (list value)
 #rabbit_hosts=$rabbit_host:$rabbit_port
@@ -356,10 +356,10 @@ rabbit_port=##RABBITMQ_PORT##
 #rabbit_use_ssl=false
  
 # The RabbitMQ userid. (string value)
-rabbit_userid=##RABBITMQ_USER##
+rabbit_userid={{ RABBITMQ_USER }}
  
 # The RabbitMQ password. (string value)
-rabbit_password=##RABBITMQ_PASSWORD##
+rabbit_password={{ RABBITMQ_PASSWORD }}
  
 # the RabbitMQ login method (string value)
 #rabbit_login_method=AMQPLAIN
@@ -557,11 +557,11 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 # ===========  end of items for agent management extension =====
  
 [keystone_authtoken]
-auth_uri = ##KEYSTONE_PUBLIC_URL##
-identity_uri = ##IDENTITY_URI##
+auth_uri = {{ KEYSTONE_PUBLIC_URL }}
+identity_uri = {{ IDENTITY_URI }}
 admin_tenant_name = service
-admin_user = ##NEUTRON_SERVICE_USER##
-admin_password = ##NEUTRON_SERVICE_PASSWORD##
+admin_user = {{ NEUTRON_SERVICE_USER }}
+admin_password = {{ NEUTRON_SERVICE_PASSWORD }}
  
 [database]
 # This line MUST be changed to actually run the plugin.
@@ -575,7 +575,7 @@ admin_password = ##NEUTRON_SERVICE_PASSWORD##
 # to put the [database] section and its connection attribute in this
 # configuration file.
 #connection=sqlite:////var/lib/neutron/neutron.sqlite
-connection=postgresql://##NEUTRON_DB_USER##:##NEUTRON_DB_PASSWORD##@onenode/neutron
+connection=postgresql://{{ NEUTRON_DB_USER }}:{{ NEUTRON_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/neutron
  
 # Database engine for which script will be generated when using offline
 # migration
-- 
cgit v1.2.1