From 6b51f3580340afa4c2f56b80d95989474ad7f56c Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Mon, 13 Oct 2014 23:02:29 +0000
Subject: [PATCH] Nova-controller config setup

Configurations will exist in nova.conf. They will be read in and
set by the start script.  The mysql configuration will be
made by nova-conductor.

Change-Id: I1709ff6620b19ef5dbcf5efe8b72c329acf96123
---
 .../nova-controller/nova-conductor/start.sh   |  2 +
 .../nova-controller/nova-controller/nova.conf | 73 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 docker/nova-controller/nova-controller/nova.conf

diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh
index 38775c3d82..9edf920155 100644
--- a/docker/nova-controller/nova-conductor/start.sh
+++ b/docker/nova-controller/nova-conductor/start.sh
@@ -34,6 +34,8 @@ EOF
 export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
 export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
 
+crudini --set /etc/nova/nova.conf DEFAULT sql_connection "mysql://nova:${NOVA_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/nova"
+
 /usr/bin/keystone user-create --name ${NOVA_KEYSTONE_USER} --pass ${NOVA_ADMIN_PASSWORD}
 /usr/bin/keystone role-create --name ${NOVA_KEYSTONE_USER}
 /usr/bin/keystone user-role-add --user ${NOVA_KEYSTONE_USER} --role admin --tenant ${ADMIN_TENANT_NAME}
diff --git a/docker/nova-controller/nova-controller/nova.conf b/docker/nova-controller/nova-controller/nova.conf
new file mode 100644
index 0000000000..0c29bd6838
--- /dev/null
+++ b/docker/nova-controller/nova-controller/nova.conf
@@ -0,0 +1,73 @@
+
+crudini --set /etc/nova/nova.conf DEFAULT amqp_durable_queues False
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST}
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_port 5672
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_hosts ${RABBITMQ_SERVICE_HOST}:5672
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_use_ssl False
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_userid guest
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_password guest
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_virtual_host /
+crudini --set /etc/nova/nova.conf DEFAULT rabbit_ha_queues False
+crudini --set /etc/nova/nova.conf DEFAULT rpc_backend nova.openstack.common.rpc.impl_kombu
+
+crudini --set /etc/nova/nova.conf DEFAULT enabled_apis ec2,osapi_compute,metadata
+crudini --set /etc/nova/nova.conf DEFAULT ec2_listen 0.0.0.0
+crudini --set /etc/nova/nova.conf DEFAULT osapi_compute_listen 0.0.0.0
+crudini --set /etc/nova/nova.conf DEFAULT osapi_compute_workers 8
+crudini --set /etc/nova/nova.conf DEFAULT metadata_listen 0.0.0.0
+crudini --set /etc/nova/nova.conf DEFAULT metadata_workers 8
+crudini --set /etc/nova/nova.conf DEFAULT service_down_time 60
+crudini --set /etc/nova/nova.conf DEFAULT rootwrap_config /etc/nova/rootwrap.conf
+crudini --set /etc/nova/nova.conf DEFAULT auth_strategy keystone
+crudini --set /etc/nova/nova.conf DEFAULT use_forwarded_for False
+crudini --set /etc/nova/nova.conf DEFAULT service_neutron_metadata_proxy True
+crudini --set /etc/nova/nova.conf DEFAULT neutron_metadata_proxy_shared_secret f699603f131747f5
+crudini --set /etc/nova/nova.conf DEFAULT neutron_default_tenant_id default
+crudini --set /etc/nova/nova.conf DEFAULT novncproxy_host 0.0.0.0
+crudini --set /etc/nova/nova.conf DEFAULT novncproxy_port 6080
+crudini --set /etc/nova/nova.conf DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292
+crudini --set /etc/nova/nova.conf DEFAULT network_api_class nova.network.neutronv2.api.API
+crudini --set /etc/nova/nova.conf DEFAULT metadata_host ${MY_IP}
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_url http://${MY_IP}:9696
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_url_timeout 30
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_admin_username neutron
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_admin_password 289fe12be92c4dd8
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_admin_tenant_name services
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_region_name RegionOne
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_admin_auth_url http://${MY_IP}:35357/v2.0
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_auth_strategy keystone
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_ovs_bridge br-int
+#crudini --set /etc/nova/nova.conf DEFAULT neutron_extension_sync_interval 600
+#crudini --set /etc/nova/nova.conf DEFAULT security_group_api neutron
+#crudini --set /etc/nova/nova.conf DEFAULT lock_path /var/lib/nova/tmp
+#crudini --set /etc/nova/nova.conf DEFAULT debug False
+#crudini --set /etc/nova/nova.conf DEFAULT verbose True
+#crudini --set /etc/nova/nova.conf DEFAULT use_syslog False
+crudini --set /etc/nova/nova.conf DEFAULT cpu_allocation_ratio 16.0
+crudini --set /etc/nova/nova.conf DEFAULT ram_allocation_ratio 1.5
+crudini --set /etc/nova/nova.conf DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter
+crudini --set /etc/nova/nova.conf DEFAULT compute_driver nova.virt.libvirt.LibvirtDriver
+crudini --set /etc/nova/nova.conf DEFAULT vif_plugging_is_fatal True
+crudini --set /etc/nova/nova.conf DEFAULT vif_plugging_timeout 300
+crudini --set /etc/nova/nova.conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
+crudini --set /etc/nova/nova.conf DEFAULT novncproxy_base_url http://${MY_IP}:6080/vnc_auto.html
+crudini --set /etc/nova/nova.conf DEFAULT vncserver_listen 0.0.0.0
+crudini --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address ${MY_IP}
+crudini --set /etc/nova/nova.conf DEFAULT vnc_enabled True
+crudini --set /etc/nova/nova.conf DEFAULT volume_api_class nova.volume.cinder.API
+crudini --set /etc/nova/nova.conf DEFAULT image_service nova.image.glance.GlanceImageService
+crudini --set /etc/nova/nova.conf DEFAULT osapi_volume_listen 0.0.0.0
+crudini --del /etc/nova/nova DEFAULT log_file
+crudini --del /etc/nova/nova  DEFAULT log_dir
+crudini --set /etc/nova/nova DEFAULT use_stderr True
+crudini --set /etc/nova/nova DEFAULT admin_token ${KEYSTONE_ADMIN_TOKEN}
+
+crudini --set /etc/nova/nova.conf conductor workers 8
+
+crudini --set /etc/nova/nova.conf keystone_authtoken auth_host ${MY_IP}
+crudini --set /etc/nova/nova.conf keystone_authtoken auth_port 35357
+crudini --set /etc/nova/nova.conf keystone_authtoken auth_protocol ${KEYSTONE_AUTH_PROTOCOL}
+crudini --set /etc/nova/nova.conf keystone_authtoken auth_uri "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/"
+crudini --set /etc/nova/nova.conf keystone_authtoken admin_user ${NOVA_KEYSTONE_USER}
+crudini --set /etc/nova/nova.conf keystone_authtoken admin_password ${NOVA_ADMIN_PASSWORD}
+crudini --set /etc/nova/nova.conf keystone_authtoken admin_tenant_name ${ADMIN_TENANT_NAME}