diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-11 19:22:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-11 19:22:00 +0000 |
| commit | 91b283ad10e449417dbbb436c2069ab77d08fc80 (patch) | |
| tree | b0db7129a8f487d46784ea13b457db070764d3bc /tools | |
| parent | 861ece743ec9a070e49de19914169a4a67e8e47d (diff) | |
| parent | 5a06901664cd8d3bb326d9e731e7dd82eec54f35 (diff) | |
| download | kolla-91b283ad10e449417dbbb436c2069ab77d08fc80.tar.gz kolla-91b283ad10e449417dbbb436c2069ab77d08fc80.zip | |
Merge "Add Magnum Containers as a Service to Kolla"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genenv | 12 | ||||
| -rwxr-xr-x | tools/kolla | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tools/genenv b/tools/genenv index ecd648e5a..483c792dd 100755 --- a/tools/genenv +++ b/tools/genenv @@ -117,6 +117,13 @@ HEAT_API_SERVICE_HOST=$HOST_IP HEAT_API_CFN_SERVICE_HOST=$HOST_IP HEAT_API_CFN_URL_HOST=$HOST_IP +# Magnum +MAGNUM_DB_NAME=magnum +MAGNUM_DB_PASSWORD=kolla +MAGNUM_KEYSTONE_PASSWORD=magnum +MAGNUM_API_SERVICE_HOST=$HOST_IP +MAGNUM_API_SERVICE_PORT=9511 + cat > ./openrc <<EOF export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" export OS_USERNAME=$ADMIN_TENANT_NAME @@ -147,6 +154,7 @@ ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME DB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD FLAT_INTERFACE=$NOVA_FLAT_INTERFACE GLANCE_API_SERVICE_HOST=$GLANCE_API_SERVICE_HOST +MAGNUM_API_SERVICE_HOST=$MAGNUM_API_SERVICE_PORT GLANCE_DB_NAME=$GLANCE_DB_NAME GLANCE_DB_PASSWORD=$GLANCE_DB_PASSWORD GLANCE_DB_USER=$GLANCE_DB_USER @@ -192,6 +200,10 @@ HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST +MAGNUM_DB_NAME=$MAGNUM_DB_NAME +MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD +MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD +MAGNUM_API_SERVICE_HOST=$MAGNUM_API_SERVICE_HOST PUBLIC_INTERFACE=$NOVA_PUBLIC_INTERFACE PUBLIC_IP=$HOST_IP PUBLIC_IP=$PUBLIC_IP diff --git a/tools/kolla b/tools/kolla index 805a5cca2..df69d64e8 100755 --- a/tools/kolla +++ b/tools/kolla @@ -38,6 +38,7 @@ function process_all { process neutron-agents fi process heat-api-engine + process magnum-api-conductor process horizon } |