openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Change neutron CLI to openstack CLI in devstack plugin.sh"

This commit is contained in:
Zuul 2018-06-03 10:05:11 +00:00 committed by Gerrit Code Review
parent 71864e8cdd 2d56b8a326
commit a8304701af
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/plugin.sh
View File

@ -269,7 +269,7 @@ function configure_neutron_defaults {
# Neutron module # Neutron module
subnetpool_id=${KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID:-${SUBNETPOOL_V4_ID}} subnetpool_id=${KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID:-${SUBNETPOOL_V4_ID}}
router=${KURYR_NEUTRON_DEFAULT_ROUTER:-$Q_ROUTER_NAME} router=${KURYR_NEUTRON_DEFAULT_ROUTER:-$Q_ROUTER_NAME}
router_id="$(neutron router-show -c id -f value \ router_id="$(openstack router show -c id -f value \
"$router")" "$router")"
project_id=$(get_or_create_project \ project_id=$(get_or_create_project \
@ -279,7 +279,7 @@ function configure_neutron_defaults {
"$KURYR_NEUTRON_DEFAULT_POD_SUBNET" \ "$KURYR_NEUTRON_DEFAULT_POD_SUBNET" \
"$subnetpool_id" \ "$subnetpool_id" \
"$router" "$router"
pod_subnet_id="$(neutron subnet-show -c id -f value \ pod_subnet_id="$(openstack subnet show -c id -f value \
"${KURYR_NEUTRON_DEFAULT_POD_SUBNET}")" "${KURYR_NEUTRON_DEFAULT_POD_SUBNET}")"
create_k8s_subnet "$project_id" \ create_k8s_subnet "$project_id" \
@ -287,16 +287,16 @@ function configure_neutron_defaults {
"$KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET" \ "$KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET" \
"$subnetpool_id" \ "$subnetpool_id" \
"$router" "$router"
service_subnet_id="$(neutron subnet-show -c id -f value \ service_subnet_id="$(openstack subnet show -c id -f value \
"${KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET}")" "${KURYR_NEUTRON_DEFAULT_SERVICE_SUBNET}")"
sg_ids=$(echo $(neutron security-group-list \ sg_ids=$(echo $(openstack security group list \
--project-id "$project_id" -c id -f value) | tr ' ' ',') --project "$project_id" -c ID -f value) | tr ' ' ',')
ext_svc_net_id="$(neutron net-show -c id -f value \ ext_svc_net_id="$(openstack network show -c id -f value \
"${KURYR_NEUTRON_DEFAULT_EXT_SVC_NET}")" "${KURYR_NEUTRON_DEFAULT_EXT_SVC_NET}")"
ext_svc_subnet_id="$(neutron subnet-show -c id -f value \ ext_svc_subnet_id="$(openstack subnet show -c id -f value \
"${KURYR_NEUTRON_DEFAULT_EXT_SVC_SUBNET}")" "${KURYR_NEUTRON_DEFAULT_EXT_SVC_SUBNET}")"
local use_octavia local use_octavia