From 6ac4296c81d6804358da538bc4b00f088ea37477 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 12 Mar 2015 17:48:16 +0000 Subject: Minimize nova conf variables --- openstack-nova.configure | 50 ++++++---------------------- openstack/usr/share/openstack/nova.yml | 10 +++--- openstack/usr/share/openstack/nova/nova.conf | 22 ++++++------ 3 files changed, 26 insertions(+), 56 deletions(-) diff --git a/openstack-nova.configure b/openstack-nova.configure index 7e263b22..dc52381d 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -47,58 +47,38 @@ sed -i "s/192\.168\.122\./192\.168\.1\./g" \ ########################################################################## -if [ -z "$IDENTITY_URI" -a \ - -z "$KEYSTONE_INTERNAL_URL" -a \ - -z "$NOVA_SERVICE_USER" -a \ +if [ -z "$NOVA_SERVICE_USER" -a \ -z "$NOVA_SERVICE_PASSWORD" -a \ -z "$NOVA_DB_USER" -a \ -z "$NOVA_DB_PASSWORD" -a \ - -z "$NOVA_NOVNCPROXY_BASE_URL" -a \ - -z "$NOVA_HOST" -a \ - -z "$NEUTRON_PUBLIC_URL" -a \ -z "$NEUTRON_SERVICE_USER" -a \ -z "$NEUTRON_SERVICE_PASSWORD" -a \ - -z "$KEYSTONE_ADMIN_URL" -a \ -z "$METADATA_PROXY_SHARED_SECRET" -a \ -z "$RABBITMQ_HOST" -a \ -z "$RABBITMQ_USER" -a \ -z "$RABBITMQ_PASSWORD" -a \ -z "$RABBITMQ_PORT" -a \ - -z "$CONTROLLER_HOST" -a \ - -z "$GLANCE_HOST" -a \ - -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \ - -z "$NOVA_PUBLIC_URL" -a \ - -z "$NOVA_INTERNAL_URL" -a \ - -z "$NOVA_ADMIN_URL" -a \ - -z "$NOVA_REGION" ]; then + -z "$CONTROLLER_HOST_ADDRESS" -a \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \ + -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" ]; then # No NOVA options defined, do nothing. exit 0 fi -if [ -z "$IDENTITY_URI" -o \ - -z "$KEYSTONE_INTERNAL_URL" -o \ - -z "$NOVA_SERVICE_USER" -o \ +if [ -z "$NOVA_SERVICE_USER" -o \ -z "$NOVA_SERVICE_PASSWORD" -o \ -z "$NOVA_DB_USER" -o \ -z "$NOVA_DB_PASSWORD" -o \ - -z "$NOVA_NOVNCPROXY_BASE_URL" -o \ - -z "$NOVA_HOST" -o \ - -z "$NEUTRON_PUBLIC_URL" -o \ -z "$NEUTRON_SERVICE_USER" -o \ -z "$NEUTRON_SERVICE_PASSWORD" -o \ - -z "$KEYSTONE_ADMIN_URL" -o \ -z "$METADATA_PROXY_SHARED_SECRET" -o \ -z "$RABBITMQ_HOST" -o \ -z "$RABBITMQ_USER" -o \ -z "$RABBITMQ_PASSWORD" -o \ -z "$RABBITMQ_PORT" -o \ - -z "$CONTROLLER_HOST" -o \ - -z "$GLANCE_HOST" -o \ - -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \ - -z "$NOVA_PUBLIC_URL" -o \ - -z "$NOVA_INTERNAL_URL" -o \ - -z "$NOVA_ADMIN_URL" -o \ - -z "$NOVA_REGION" ]; then + -z "$CONTROLLER_HOST_ADDRESS" -o \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -o \ + -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" ]; then echo Some options required for Nova were defined, but not all. exit 1 fi @@ -114,30 +94,20 @@ python <<'EOF' >"$OPENSTACK_DATA/nova.conf" import os, sys, yaml nova_configuration={ - 'IDENTITY_URI': os.environ['IDENTITY_URI'], - 'KEYSTONE_INTERNAL_URL': os.environ['KEYSTONE_INTERNAL_URL'], 'NOVA_SERVICE_USER': os.environ['NOVA_SERVICE_USER'], 'NOVA_SERVICE_PASSWORD': os.environ['NOVA_SERVICE_PASSWORD'], 'NOVA_DB_USER': os.environ['NOVA_DB_USER'], 'NOVA_DB_PASSWORD': os.environ['NOVA_DB_PASSWORD'], - 'NOVA_NOVNCPROXY_BASE_URL': os.environ['NOVA_NOVNCPROXY_BASE_URL'], - 'NOVA_HOST': os.environ['NOVA_HOST'], - 'NEUTRON_PUBLIC_URL': os.environ['NEUTRON_PUBLIC_URL'], 'NEUTRON_SERVICE_USER': os.environ['NEUTRON_SERVICE_USER'], 'NEUTRON_SERVICE_PASSWORD': os.environ['NEUTRON_SERVICE_PASSWORD'], - 'KEYSTONE_ADMIN_URL': os.environ['KEYSTONE_ADMIN_URL'], 'METADATA_PROXY_SHARED_SECRET': os.environ['METADATA_PROXY_SHARED_SECRET'], 'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'], 'RABBITMQ_USER': os.environ['RABBITMQ_USER'], 'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'], 'RABBITMQ_PORT': os.environ['RABBITMQ_PORT'], - 'CONTROLLER_HOST': os.environ['CONTROLLER_HOST'], - 'GLANCE_HOST': os.environ['GLANCE_HOST'], + 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'], + 'MANAGEMENT_INTERFACE_IP_ADDRESS': os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS'], 'KEYSTONE_TEMPORARY_ADMIN_TOKEN': os.environ['KEYSTONE_TEMPORARY_ADMIN_TOKEN'], - 'NOVA_PUBLIC_URL': os.environ['NOVA_PUBLIC_URL'], - 'NOVA_INTERNAL_URL': os.environ['NOVA_INTERNAL_URL'], - 'NOVA_ADMIN_URL': os.environ['NOVA_ADMIN_URL'], - 'NOVA_REGION': os.environ['NOVA_REGION'], } yaml.dump(nova_configuration, sys.stdout, default_flow_style=False) diff --git a/openstack/usr/share/openstack/nova.yml b/openstack/usr/share/openstack/nova.yml index 15b1f3be..9d08a46d 100644 --- a/openstack/usr/share/openstack/nova.yml +++ b/openstack/usr/share/openstack/nova.yml @@ -37,16 +37,16 @@ name=nova type=compute description="Openstack Compute Service" - publicurl={{ NOVA_PUBLIC_URL }} - internalurl={{ NOVA_INTERNAL_URL | default('http://127.0.0.1:8774/v2/%(tenant_id)s') }} - adminurl={{ NOVA_ADMIN_URL }} + publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s' + internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s' + adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s' region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - postgresql_user: name={{ NOVA_DB_USER }} + - postgresql_user: name={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ NOVA_DB_PASSWORD }} sudo: yes sudo_user: nova - - postgresql_db: name=nova owner={{ NOVA_DB_USER }} + - postgresql_db: name=nova owner={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} sudo: yes sudo_user: nova diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf index 8c05e09a..610da0f9 100644 --- a/openstack/usr/share/openstack/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 @@ -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 }} # 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. @@ -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={{ NOVA_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 }}@{{ CONTROLLER_HOST }}/nova +connection=postgresql://{{ NOVA_DB_USER }}:{{ NOVA_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/nova ############# # CONDUCTOR # @@ -607,8 +607,8 @@ 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 -- cgit v1.2.1