diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-04 03:50:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-04 03:50:28 +0000 |
| commit | 75ccdb25999f30ecfb3ec406b8baa4d20ec2f98a (patch) | |
| tree | 95ed940eff67b421a65fee21d1c5c6b2c3650151 /tools | |
| parent | 72cc08eb87ffecc777aa7352b4df4d41f20fc4d8 (diff) | |
| parent | 19f3ad9eca9e9d73e6a147b06d66d4dcb66d2934 (diff) | |
| download | keystone-75ccdb25999f30ecfb3ec406b8baa4d20ec2f98a.tar.gz | |
Merge "Create neutron service in sample_data.sh"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sample_data.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tools/sample_data.sh b/tools/sample_data.sh index bb1eada8e..bf96023f5 100755 --- a/tools/sample_data.sh +++ b/tools/sample_data.sh @@ -36,6 +36,7 @@ # service nova admin # service ec2 admin # service swift admin +# service neutron admin # By default, passwords used are those in the OpenStack Install and Deploy Manual. # One can override these (publicly known, and hence, insecure) passwords by setting the appropriate @@ -53,6 +54,7 @@ NOVA_PASSWORD=${NOVA_PASSWORD:-${SERVICE_PASSWORD:-nova}} GLANCE_PASSWORD=${GLANCE_PASSWORD:-${SERVICE_PASSWORD:-glance}} EC2_PASSWORD=${EC2_PASSWORD:-${SERVICE_PASSWORD:-ec2}} SWIFT_PASSWORD=${SWIFT_PASSWORD:-${SERVICE_PASSWORD:-swiftpass}} +NEUTRON_PASSWORD=${NEUTRON_PASSWORD:-${SERVICE_PASSWORD:-neutron}} CONTROLLER_PUBLIC_ADDRESS=${CONTROLLER_PUBLIC_ADDRESS:-localhost} CONTROLLER_ADMIN_ADDRESS=${CONTROLLER_ADMIN_ADDRESS:-localhost} @@ -147,6 +149,13 @@ openstack role add --user swift \ --project service \ admin +openstack user create neutron --project service \ + --password "${NEUTRON_PASSWORD}" \ + +openstack role add --user neutron \ + --project service \ + admin + # # Keystone service # @@ -231,6 +240,20 @@ if [[ -z "$DISABLE_ENDPOINTS" ]]; then swift fi +# +# Neutron service +# +openstack service create --name=neutron \ + --description="Neutron Network Service" \ + network +if [[ -z "$DISABLE_ENDPOINTS" ]]; then + openstack endpoint create --region RegionOne \ + --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:9696" \ + --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:9696" \ + --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9696" \ + neutron +fi + # create ec2 creds and parse the secret and access key returned ADMIN_USER=$(get_id openstack user show admin) RESULT=$(openstack ec2 credentials create --project service --user $ADMIN_USER) |