From 25049cd23de0e8055326c668ff119dd8cdf0bae4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 9 Jan 2014 13:53:52 +0100 Subject: [PATCH] Use --tenant-id, not --tenant_id Change-Id: I0e3d65d5b69ac82cbf7ee6ffc41ead369af8c126 --- lib/cinder | 2 +- lib/ironic | 4 ++-- lib/marconi | 2 +- lib/neutron | 14 +++++++------- lib/nova | 2 +- lib/savanna | 2 +- lib/swift | 2 +- lib/trove | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/cinder b/lib/cinder index cbe732e9b0..fe278f60bb 100644 --- a/lib/cinder +++ b/lib/cinder @@ -365,7 +365,7 @@ create_cinder_accounts() { CINDER_USER=$(keystone user-create \ --name=cinder \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=cinder@example.com \ | grep " id " | get_field 2) keystone user-role-add \ diff --git a/lib/ironic b/lib/ironic index 099746ae22..1ff3c81f06 100644 --- a/lib/ironic +++ b/lib/ironic @@ -149,11 +149,11 @@ create_ironic_accounts() { IRONIC_USER=$(keystone user-create \ --name=ironic \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=ironic@example.com \ | grep " id " | get_field 2) keystone user-role-add \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --user_id $IRONIC_USER \ --role_id $ADMIN_ROLE if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then diff --git a/lib/marconi b/lib/marconi index 742f866e7d..6b9ffdc0b3 100644 --- a/lib/marconi +++ b/lib/marconi @@ -142,7 +142,7 @@ function create_marconi_accounts() { MARCONI_USER=$(get_id keystone user-create --name=marconi \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=marconi@example.com) keystone user-role-add --tenant-id $SERVICE_TENANT \ --user-id $MARCONI_USER \ diff --git a/lib/neutron b/lib/neutron index a7519ad328..43f43f951a 100644 --- a/lib/neutron +++ b/lib/neutron @@ -328,7 +328,7 @@ function create_neutron_accounts() { NEUTRON_USER=$(keystone user-create \ --name=neutron \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=neutron@example.com \ | grep " id " | get_field 2) keystone user-role-add \ @@ -357,7 +357,7 @@ function create_neutron_initial_network() { # Create a small network # Since neutron command is executed in admin context at this point, - # ``--tenant_id`` needs to be specified. + # ``--tenant-id`` needs to be specified. if is_baremetal; then if [[ "$PUBLIC_INTERFACE" == '' || "$OVS_PHYSICAL_BRIDGE" == '' ]]; then die $LINENO "Neutron settings for baremetal not set.. exiting" @@ -367,16 +367,16 @@ function create_neutron_initial_network() { sudo ip addr del $IP dev $PUBLIC_INTERFACE sudo ip addr add $IP dev $OVS_PHYSICAL_BRIDGE done - NET_ID=$(neutron net-create $PHYSICAL_NETWORK --tenant_id $TENANT_ID --provider:network_type flat --provider:physical_network "$PHYSICAL_NETWORK" | grep ' id ' | get_field 2) + NET_ID=$(neutron net-create $PHYSICAL_NETWORK --tenant-id $TENANT_ID --provider:network_type flat --provider:physical_network "$PHYSICAL_NETWORK" | grep ' id ' | get_field 2) die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PHYSICAL_NETWORK $TENANT_ID" - SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2) + SUBNET_ID=$(neutron subnet-create --tenant-id $TENANT_ID --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2) die_if_not_set $LINENO SUBNET_ID "Failure creating SUBNET_ID for $TENANT_ID" sudo ifconfig $OVS_PHYSICAL_BRIDGE up sudo route add default gw $NETWORK_GATEWAY dev $OVS_PHYSICAL_BRIDGE else - NET_ID=$(neutron net-create --tenant_id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2) + NET_ID=$(neutron net-create --tenant-id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2) die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PHYSICAL_NETWORK $TENANT_ID" - SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2) + SUBNET_ID=$(neutron subnet-create --tenant-id $TENANT_ID --ip_version 4 --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2) die_if_not_set $LINENO SUBNET_ID "Failure creating SUBNET_ID for $TENANT_ID" fi @@ -384,7 +384,7 @@ function create_neutron_initial_network() { # Create a router, and add the private subnet as one of its interfaces if [[ "$Q_L3_ROUTER_PER_TENANT" == "True" ]]; then # create a tenant-owned router. - ROUTER_ID=$(neutron router-create --tenant_id $TENANT_ID $Q_ROUTER_NAME | grep ' id ' | get_field 2) + ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID $Q_ROUTER_NAME | grep ' id ' | get_field 2) die_if_not_set $LINENO ROUTER_ID "Failure creating ROUTER_ID for $TENANT_ID $Q_ROUTER_NAME" else # Plugin only supports creating a single router, which should be admin owned. diff --git a/lib/nova b/lib/nova index e754341bad..367ec83072 100644 --- a/lib/nova +++ b/lib/nova @@ -318,7 +318,7 @@ create_nova_accounts() { NOVA_USER=$(keystone user-create \ --name=nova \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=nova@example.com \ | grep " id " | get_field 2) keystone user-role-add \ diff --git a/lib/savanna b/lib/savanna index 6794e36dfd..bb4dfe693d 100644 --- a/lib/savanna +++ b/lib/savanna @@ -56,7 +56,7 @@ function create_savanna_accounts() { SAVANNA_USER=$(keystone user-create \ --name=savanna \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=savanna@example.com \ | grep " id " | get_field 2) keystone user-role-add \ diff --git a/lib/swift b/lib/swift index 96929db557..44c230be93 100644 --- a/lib/swift +++ b/lib/swift @@ -514,7 +514,7 @@ function create_swift_accounts() { ADMIN_ROLE=$(keystone role-list | awk "/ admin / { print \$2 }") SWIFT_USER=$(keystone user-create --name=swift --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT --email=swift@example.com | grep " id " | get_field 2) + --tenant-id $SERVICE_TENANT --email=swift@example.com | grep " id " | get_field 2) keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $SWIFT_USER --role-id $ADMIN_ROLE if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then diff --git a/lib/trove b/lib/trove index f8e3eddfe2..4efdb5d669 100644 --- a/lib/trove +++ b/lib/trove @@ -64,7 +64,7 @@ create_trove_accounts() { TROVE_USER=$(keystone user-create \ --name=trove \ --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ + --tenant-id $SERVICE_TENANT \ --email=trove@example.com \ | grep " id " | get_field 2) keystone user-role-add --tenant-id $SERVICE_TENANT \