Update the upstream sample-data.sh script for Solaris shell tools,

additional OpenStack components, and the deprecation of keystone(1) in

lieu of openstack(1) in Kilo.

This patch is Solaris-specific and not suitable for upstream

contribution.

--- keystone-2015.1.2/tools/sample_data.sh.orig	2016-01-12 14:41:47.118476961 -0500

+++ keystone-2015.1.2/tools/sample_data.sh	2016-01-12 14:49:03.317361531 -0500

+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.

@@ -19,8 +21,8 @@

 # This script is based on the original DevStack keystone_data.sh script.

 #

 # It demonstrates how to bootstrap Keystone with an administrative user

-# using the OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT environment variables

-# and the administrative API.  It will get the admin_token (OS_SERVICE_TOKEN)

+# using the OS_TOKEN and OS_URL environment variables

+# and the administrative API.  It will get the admin_token (OS_TOKEN)

 # and admin_port from keystone.conf if available.

 #

 # Disable creation of endpoints by setting DISABLE_ENDPOINTS environment variable.

@@ -29,29 +31,67 @@

 # A EC2-compatible credential is created for the admin user and

 # placed in etc/ec2rc.

 #

-# Tenant               User      Roles

-# -------------------------------------------------------

-# demo                 admin     admin

-# service              glance    admin

-# service              nova      admin

-# service              ec2       admin

-# service              swift     admin

+# Tenant               User       Roles

+# --------------------------------------------------------

+# demo                 admin      admin

+# service              glance     admin

+# service              nova       admin

+# service              ec2        admin

+# service              swift      admin

+# service              cinder     admin

+# service              neutron    admin

+# service              heat       admin

+# service              ironic     admin

+HEAT_PASSWORD=${HEAT_PASSWORD:-${SERVICE_PASSWORD:-heat}}

+IRONIC_PASSWORD=${IRONIC_PASSWORD:-${SERVICE_PASSWORD:-ironic}}

+IRONIC_PUBLIC_ADDRESS=${IRONIC_PUBLIC_ADDRESS:-$CONTROLLER_PUBLIC_ADDRESS}

+IRONIC_ADMIN_ADDRESS=${IRONIC_ADMIN_ADDRESS:-$CONTROLLER_ADMIN_ADDRESS}

+IRONIC_INTERNAL_ADDRESS=${IRONIC_INTERNAL_ADDRESS:-$CONTROLLER_INTERNAL_ADDRESS}

+HEAT_CFN_PUBLIC_ADDRESS=${HEAT_CFN_PUBLIC_ADDRESS:-$CONTROLLER_PUBLIC_ADDRESS}

+HEAT_CFN_ADMIN_ADDRESS=${HEAT_CFN_ADMIN_ADDRESS:-$CONTROLLER_ADMIN_ADDRESS}

+HEAT_CFN_INTERNAL_ADDRESS=${HEAT_CFN_INTERNAL_ADDRESS:-$CONTROLLER_INTERNAL_ADDRESS}

+HEAT_PUBLIC_ADDRESS=${HEAT_PUBLIC_ADDRESS:-$CONTROLLER_PUBLIC_ADDRESS}

+HEAT_ADMIN_ADDRESS=${HEAT_ADMIN_ADDRESS:-$CONTROLLER_ADMIN_ADDRESS}

+HEAT_INTERNAL_ADDRESS=${HEAT_INTERNAL_ADDRESS:-$CONTROLLER_INTERNAL_ADDRESS}

@@ -67,169 +107,221 @@

-    if [[ -z "${CONFIG_SERVICE_TOKEN}" ]]; then

-        # default config options are commented out, so lets try those

-        CONFIG_SERVICE_TOKEN=$(sed 's/[[:space:]]//g' $KEYSTONE_CONF | grep ^\#admin_token= | cut -d'=' -f2)

-    fi

-    if [[ -z "${CONFIG_ADMIN_PORT}" ]]; then

-        # default config options are commented out, so lets try those

-        CONFIG_ADMIN_PORT=$(sed 's/[[:space:]]//g' $KEYSTONE_CONF | grep ^\#admin_port= | cut -d'=' -f2)

-    fi

-fi

-

-export OS_SERVICE_TOKEN=${OS_SERVICE_TOKEN:-$CONFIG_SERVICE_TOKEN}

-if [[ -z "$OS_SERVICE_TOKEN" ]]; then

-    echo "No service token found."

-    echo "Set OS_SERVICE_TOKEN manually from keystone.conf admin_token."

-    exit 1

-export OS_SERVICE_ENDPOINT=${OS_SERVICE_ENDPOINT:-http://$CONTROLLER_PUBLIC_ADDRESS:${CONFIG_ADMIN_PORT:-35357}/v2.0}

+export OS_TOKEN=${OS_TOKEN:-$CONFIG_SERVICE_TOKEN}

+if [[ -z "$OS_TOKEN" ]]; then

+    echo "No authentication token found."

+    echo "Set OS_TOKEN manually from keystone.conf admin_token."

+    exit 1

+fi

-function get_id () {

-    echo `"$@" | grep ' id ' | awk '{print $4}'`

-}

+export OS_URL=${OS_URL:-http://$CONTROLLER_PUBLIC_ADDRESS:${CONFIG_ADMIN_PORT:-35357}/v2.0}

 #

 # Default tenant

 #

-DEMO_TENANT=$(get_id keystone tenant-create --name=demo \

-                                            --description "Default Tenant")

-

-ADMIN_USER=$(get_id keystone user-create --name=admin \

-                                         --pass="${ADMIN_PASSWORD}")

+openstack project create --description "Default Tenant" demo

-ADMIN_ROLE=$(get_id keystone role-create --name=admin)

-

-keystone user-role-add --user-id $ADMIN_USER \

-                       --role-id $ADMIN_ROLE \

-                       --tenant-id $DEMO_TENANT

+# Admin user/role

+openstack user create --project demo --password "${ADMIN_PASSWORD}" admin

+openstack role create admin

+openstack role add --user admin --project demo admin

 #

 # Service tenant

 #

-SERVICE_TENANT=$(get_id keystone tenant-create --name=service \

-                                               --description "Service Tenant")

-

-GLANCE_USER=$(get_id keystone user-create --name=glance \

-                                          --pass="${GLANCE_PASSWORD}")

+openstack project create --description "Service Tenant" service

-keystone user-role-add --user-id $GLANCE_USER \

-                       --role-id $ADMIN_ROLE \

-                       --tenant-id $SERVICE_TENANT

-

-NOVA_USER=$(get_id keystone user-create --name=nova \

-                                        --pass="${NOVA_PASSWORD}" \

-                                        --tenant-id $SERVICE_TENANT)

-

-keystone user-role-add --user-id $NOVA_USER \

-                       --role-id $ADMIN_ROLE \

-                       --tenant-id $SERVICE_TENANT

-

-EC2_USER=$(get_id keystone user-create --name=ec2 \

-                                       --pass="${EC2_PASSWORD}" \

-                                       --tenant-id $SERVICE_TENANT)

-

-keystone user-role-add --user-id $EC2_USER \

-                       --role-id $ADMIN_ROLE \

-                       --tenant-id $SERVICE_TENANT

-

-SWIFT_USER=$(get_id keystone user-create --name=swift \

-                                         --pass="${SWIFT_PASSWORD}" \

-                                         --tenant-id $SERVICE_TENANT)

-

-keystone user-role-add --user-id $SWIFT_USER \

-                       --role-id $ADMIN_ROLE \

-                       --tenant-id $SERVICE_TENANT

+# Glance user

+openstack user create --project service --password "${GLANCE_PASSWORD}" glance

+openstack role add --user glance --project service admin

+# Nova user

+openstack user create --project service --password "${NOVA_PASSWORD}" nova

+openstack role add --user nova --project service admin

+

+# EC2 user

+openstack user create --project service --password "${EC2_PASSWORD}" ec2

+openstack role add --user ec2 --project service admin

+

+# Swift user

+openstack user create --project service --password "${SWIFT_PASSWORD}" swift

+openstack role add --user swift --project service admin

+# Cinder user

+openstack user create --project service --password "${CINDER_PASSWORD}"  cinder

+openstack role add --user cinder --project service admin

+

+# Neutron user

+openstack user create --project service --password "${NEUTRON_PASSWORD}" neutron

+openstack role add --user neutron --project service admin

+# Ironic user

+openstack user create --project service --password "${IRONIC_PASSWORD}" ironic

+openstack role add --user ironic --project service admin

+# Heat user

+openstack user create --project service --password "${HEAT_PASSWORD}" heat

+openstack role add --user heat --project service admin

-KEYSTONE_SERVICE=$(get_id \

-keystone service-create --name=keystone \

-                        --type=identity \

-                        --description="Keystone Identity Service")

+openstack service create --name keystone \

+                         --description "Keystone Identity Service" \

+                        identity

-    keystone endpoint-create --region RegionOne --service-id $KEYSTONE_SERVICE \

+    openstack endpoint create --region RegionOne \

         --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:\$(public_port)s/v2.0" \

         --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:\$(admin_port)s/v2.0" \

-        --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:\$(public_port)s/v2.0"

+        --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:\$(public_port)s/v2.0" \

+       keystone

 fi

+

 #

 # Nova service

 #

-NOVA_SERVICE=$(get_id \

-keystone service-create --name=nova \

-                        --type=compute \

-                        --description="Nova Compute Service")

+openstack service create --name nova \

+                         --description="Nova Compute Service" \

+                         compute

 if [[ -z "$DISABLE_ENDPOINTS" ]]; then

-    keystone endpoint-create --region RegionOne --service-id $NOVA_SERVICE \

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$NOVA_INTERNAL_ADDRESS:8774/v2/\$(tenant_id)s" \

+       nova

+

-# Volume service

+# Volume service - v1 and v2

-VOLUME_SERVICE=$(get_id \

-                        --type=volume \

+openstack service create --name cinder \

+                         --description "Cinder Volume Service" \

+                        volume

+openstack service create --name cinderv2 \

+                         --description "Cinder Volume Service version 2" \

+                        volumev2

-    keystone endpoint-create --region RegionOne --service-id $VOLUME_SERVICE \

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$CINDER_INTERNAL_ADDRESS:8776/v1/\$(tenant_id)s" \

+       cinder

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --publicurl "http://$CINDER_PUBLIC_ADDRESS:8776/v2/\$(tenant_id)s" \

+        --adminurl "http://$CINDER_ADMIN_ADDRESS:8776/v2/\$(tenant_id)s" \

+        --internalurl "http://$CINDER_INTERNAL_ADDRESS:8776/v2/\$(tenant_id)s" \

+       cinderv2

+fi

+

 # Image service

 #

-GLANCE_SERVICE=$(get_id \

-keystone service-create --name=glance \

-                        --type=image \

-                        --description="Glance Image Service")

-if [[ -z "$DISABLE_ENDPOINTS" ]]; then

-    keystone endpoint-create --region RegionOne --service-id $GLANCE_SERVICE \

+openstack service create --name glance \

+                         --description "Glance Image Service" \

+                        image

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$GLANCE_INTERNAL_ADDRESS:9292" \

+       glance

+

 # EC2 service

 #

-EC2_SERVICE=$(get_id \

-keystone service-create --name=ec2 \

-                        --type=ec2 \

-                        --description="EC2 Compatibility Layer")

-if [[ -z "$DISABLE_ENDPOINTS" ]]; then

-    keystone endpoint-create --region RegionOne --service-id $EC2_SERVICE \

+openstack service create --name ec2 \

+                         --description "EC2 Compatibility Layer" \

+                        ec2

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$EC2_INTERNAL_ADDRESS:8773/services/Cloud" \

+       ec2

+

 # Swift service

 #

-SWIFT_SERVICE=$(get_id \

-keystone service-create --name=swift \

-                        --type="object-store" \

-if [[ -z "$DISABLE_ENDPOINTS" ]]; then

-    keystone endpoint-create --region RegionOne --service-id $SWIFT_SERVICE \

+openstack service create --name swift \

+                         --description "Swift Object Store Service" \

+                        object-store

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$SWIFT_INTERNAL_ADDRESS:8080/v1/AUTH_\$(tenant_id)s" \

+       swift

+

+openstack service create --name neutron \

+                         --description "Neutron Network Service" \

+                        network

+    openstack endpoint create --region RegionOne \

+        --internalurl "http://$NEUTRON_INTERNAL_ADDRESS:9696/" \

+       neutron

+fi

+

+#

+# Ironic service

+#

+openstack service create --name ironic \

+                        --description "Bare Metal Provisioning Service" \

+                        baremetal

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --publicurl "http://$IRONIC_PUBLIC_ADDRESS:6385/" \

+        --adminurl "http://$IRONIC_ADMIN_ADDRESS:6385/" \

+        --internalurl "http://$IRONIC_INTERNAL_ADDRESS:6385/" \

+       ironic

+fi

+

+#

+# Heat services

+#

+openstack service create --name heat-cfn \

+                        --description "Heat CloudFormation API" \

+                        cloudformation

+

+openstack service create --name heat \

+                        --description "Heat API" \

+                        orchestration

+

+if [[ -z "$DISABLE_ENDPOINTS" ]]; then

+    openstack endpoint create --region RegionOne \

+        --publicurl "http://$HEAT_CFN_PUBLIC_ADDRESS:8000/v1" \

+        --adminurl "http://$HEAT_CFN_ADMIN_ADDRESS:8000/v1" \

+        --internalurl "http://$HEAT_CFN_INTERNAL_ADDRESS:8000/v1" \

+       heat-cfn

+

+    openstack endpoint create --region RegionOne \

+        --publicurl "http://$HEAT_PUBLIC_ADDRESS:8004/v1/\$(tenant_id)s" \

+        --adminurl "http://$HEAT_ADMIN_ADDRESS:8004/v1/\$(tenant_id)s" \

+        --internalurl "http://$HEAT_INTERNAL_ADDRESS:8004/v1/\$(tenant_id)s" \

+       heat

-RESULT=$(keystone ec2-credentials-create --tenant-id=$SERVICE_TENANT --user-id=$ADMIN_USER)

+RESULT=$(openstack ec2 credentials create --project service --user admin)