diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-03-26 19:47:56 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-10 03:11:23 +0000 |
| commit | 2f2bb366e0aa856803c0d21a7a541802d814d180 (patch) | |
| tree | 90a14023c95940161feb5032b15336e0695695d4 /tools | |
| parent | 0b671ad58d31dc3c3704a35a9ef0c17af0834e72 (diff) | |
| download | kolla-2f2bb366e0aa856803c0d21a7a541802d814d180.tar.gz kolla-2f2bb366e0aa856803c0d21a7a541802d814d180.zip | |
Adds neutron-server to neutron container-set
Adds neutron-server components of the neutron container set.
Partially Implements: blueprint compute-operation-neutron
Change-Id: I63525ae85f4ead4e010cdb9b6bc8059bb9d252e7
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/tools/genenv b/tools/genenv index bb349b5b0..0f3226036 100755 --- a/tools/genenv +++ b/tools/genenv @@ -50,6 +50,9 @@ RABBITMQ_SERVICE_HOST=$HOST_IP RABBIT_USER=guest RABBIT_PASSWORD=guest +# Networking Options are nova or neutron +NETWORK_MANAGER=neutron + # Keystone KEYSTONE_ADMIN_TOKEN=$PASSWORD KEYSTONE_DB_PASSWORD=kolla @@ -77,7 +80,6 @@ NOVA_API_SERVICE_HOST=$HOST_IP NOVA_EC2_SERVICE_HOST=$HOST_IP NOVA_PUBLIC_INTERFACE=$MY_DEV NOVA_FLAT_INTERFACE=eth1 -CONFIG_NETWORK=True ENABLED_APIS=ec2,osapi_compute,metadata METADATA_HOST=$HOST_IP @@ -85,6 +87,18 @@ METADATA_HOST=$HOST_IP NEUTRON_FLAT_NETWORK_NAME=physnet1 NEUTRON_FLAT_NETWORK_INTERFACE=eth1 +# Neutron +NEUTRON_DB_NAME=neutron +NEUTRON_DB_USER=neutron +NEUTRON_DB_PASSWORD=password +NEUTRON_KEYSTONE_USER=neutron +NEUTRON_KEYSTONE_PASSWORD=neutron +NEUTRON_SERVER_SERVICE_HOST=$HOST_IP +NEUTRON_API_PASTE_CONFIG=/usr/share/neutron/api-paste.ini + +# Nova/Neutron +NEUTRON_SHARED_SECRET=sharedsecret + # Heat HEAT_DB_NAME=heat HEAT_DB_PASSWORD=kolla @@ -114,7 +128,6 @@ NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE=$NEUTRON_LINUXBRIDGE_AGENT_LOG_FILE NEUTRON_METADATA_AGENT_LOG_FILE=$NEUTRON_METADATA_AGENT_LOG_FILE ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME -CONFIG_NETWORK=$CONFIG_NETWORK DB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD FLAT_INTERFACE=$NOVA_FLAT_INTERFACE GLANCE_API_SERVICE_HOST=$GLANCE_API_SERVICE_HOST @@ -133,7 +146,7 @@ KEYSTONE_DB_PASSWORD=$KEYSTONE_DB_PASSWORD KEYSTONE_PUBLIC_SERVICE_HOST=$KEYSTONE_PUBLIC_SERVICE_HOST MARIADB_SERVICE_HOST=$HOST_IP MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD -NETWORK_MANAGER=nova +NETWORK_MANAGER=$NETWORK_MANAGER NOVA_API_SERVICE_HOST=$NOVA_API_SERVICE_HOST ENABLED_APIS=$ENABLED_APIS METADATA_HOST=$METADATA_HOST @@ -144,6 +157,14 @@ NOVA_EC2_API_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER +NEUTRON_SHARED_SECRET:=$NEUTRON_SHARED_SECRET +NEUTRON_DB_NAME=$NEUTRON_DB_NAME +NEUTRON_DB_USER=$NEUTRON_DB_USER +NEUTRON_DB_PASSWORD=$NEUTRON_DB_PASSWORD +NEUTRON_KEYSTONE_USER=$NEUTRON_KEYSTONE_USER +NEUTRON_KEYSTONE_PASSWORD=$NEUTRON_KEYSTONE_PASSWORD +NEUTRON_SERVER_SERVICE_HOST=$NEUTRON_SERVER_SERVICE_HOST +NEUTRON_API_PASTE_CONFIG=$NEUTRON_API_PASTE_CONFIG HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD |