From 2d2614b43ad388236a3fa91c4a18a74cd44876cc Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Wed, 11 Jan 2017 18:15:03 -0800 Subject: [PATCH] Neutron service package This PS adds a neutron service package. Change-Id: I4798acce844faa80f7c9e472465a36528a700bd4 --- helm/all_values.yaml | 2 +- helm/service/neutron/requirements.yaml | 36 ++++++++ helm/service/neutron/values.yaml | 69 ++++++++++++++ ...tron-service-package-9c170d2caaabcf24.yaml | 4 + tests/bin/ceph_workflow_service.sh | 90 +++++++------------ tests/bin/gate_capture_logs.sh | 6 ++ 6 files changed, 148 insertions(+), 59 deletions(-) create mode 100644 helm/service/neutron/values.yaml create mode 100644 releasenotes/notes/neutron-service-package-9c170d2caaabcf24.yaml diff --git a/helm/all_values.yaml b/helm/all_values.yaml index 691b84602..d5d43b23c 100755 --- a/helm/all_values.yaml +++ b/helm/all_values.yaml @@ -119,7 +119,7 @@ neutron-server-svc: all: port: 9696 node_port: 9696 - port_external: false + port_external: true node_port_enabled: false neutron-create-db-job: diff --git a/helm/service/neutron/requirements.yaml b/helm/service/neutron/requirements.yaml index b8142bd40..637d557ac 100644 --- a/helm/service/neutron/requirements.yaml +++ b/helm/service/neutron/requirements.yaml @@ -1,4 +1,40 @@ dependencies: + - name: neutron-create-db-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-server-svc + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-create-keystone-service-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-create-keystone-endpoint-admin-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-create-keystone-endpoint-internal-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-create-keystone-endpoint-public-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-create-keystone-user-job + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-manage-db-job + repository: http://localhost:10191 + version: 0.4.0-1 - name: neutron-server-deployment repository: http://localhost:10191 version: 0.4.0-1 + - name: neutron-dhcp-agent-daemonset + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-l3-agent-daemonset + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-metadata-agent-daemonset + repository: http://localhost:10191 + version: 0.4.0-1 + - name: neutron-openvswitch-agent-daemonset + repository: http://localhost:10191 + version: 0.4.0-1 diff --git a/helm/service/neutron/values.yaml b/helm/service/neutron/values.yaml new file mode 100644 index 000000000..6a04ead46 --- /dev/null +++ b/helm/service/neutron/values.yaml @@ -0,0 +1,69 @@ +global: + kolla: + all: + kubernetes_entrypoint: true + neutron: + create_db: + job: + dependencies: + service: + - mariadb + manage_db: + job: + dependencies: + jobs: + - neutron-create-db + service: + - keystone-admin + create_keystone_user: + job: + dependencies: + service: + - keystone-admin + create_keystone_service: + job: + dependencies: + service: + - keystone-admin + create_keystone_endpoint: + all: + dependencies: + jobs: + - neutron-create-keystone-service + service: + - keystone-admin + server: + deployment: + dependencies: + jobs: + - neutron-manage-db + - neutron-create-keystone-user + - neutron-create-keystone-endpoint-public + - neutron-create-keystone-endpoint-internal + - neutron-create-keystone-endpoint-admin + service: + - keystone-admin + openvswitch_agent: + daemonset: + dependencies: + service: + - keystone-admin + - neutron-server + l3_agent: + daemonset: + dependencies: + service: + - keystone-admin + - neutron-server + dhcp_agent: + daemonset: + dependencies: + service: + - keystone-admin + - neutron-server + metadata_agent: + daemonset: + dependencies: + service: + - keystone-admin + - neutron-server diff --git a/releasenotes/notes/neutron-service-package-9c170d2caaabcf24.yaml b/releasenotes/notes/neutron-service-package-9c170d2caaabcf24.yaml new file mode 100644 index 000000000..a26572868 --- /dev/null +++ b/releasenotes/notes/neutron-service-package-9c170d2caaabcf24.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Neutron service level deploymnet with kubernetes entrypoint. diff --git a/tests/bin/ceph_workflow_service.sh b/tests/bin/ceph_workflow_service.sh index e6aad4688..6d7d0bdaa 100755 --- a/tests/bin/ceph_workflow_service.sh +++ b/tests/bin/ceph_workflow_service.sh @@ -67,7 +67,7 @@ kollakube res create configmap \ kollakube res create secret nova-libvirt -helm install --debug kolla/mariadb --version $VERSION \ +helm install kolla/mariadb --version $VERSION \ --namespace kolla --name mariadb --set "$common_vars,element_name=mariadb" \ --values <(helm_entrypoint_general $1) @@ -85,10 +85,6 @@ helm install kolla/memcached-svc --version $VERSION \ helm install kolla/rabbitmq-svc --version $VERSION \ --namespace kolla --name rabbitmq-svc --set element_name=rabbitmq -helm install kolla/neutron-server-svc --version $VERSION \ - --namespace kolla --name neutron-server-svc \ - --set "port_external=true,external_vip=$IP" - helm install kolla/cinder-api-svc --version $VERSION \ --namespace kolla --name cinder-api-svc \ --set "element_name=cinder,port_external=true,external_vip=$IP" @@ -128,7 +124,7 @@ helm install kolla/rabbitmq-statefulset --version $VERSION \ $DIR/tools/pull_containers.sh kolla $DIR/tools/wait_for_pods.sh kolla -helm install kolla/keystone --debug --version $VERSION \ +helm install kolla/keystone --version $VERSION \ --namespace kolla --name keystone --set "$common_vars,element_name=keystone" \ --values <(helm_entrypoint_general $1) @@ -137,22 +133,16 @@ $DIR/tools/wait_for_pods.sh kolla $DIR/tools/build_local_admin_keystonerc.sh . ~/keystonerc_admin -helm install kolla/neutron-create-keystone-service-job --version $VERSION \ - --namespace kolla --name neutron-create-keystone-service --set "$common_vars" - helm install kolla/cinder-create-keystone-service-job --version $VERSION \ --namespace kolla --name cinder-create-keystone-service --set "$common_vars" helm install kolla/cinder-create-keystone-servicev2-job --version $VERSION \ --namespace kolla --name cinder-create-keystone-servicev2 --set "$common_vars" -helm install kolla/cinder-create-keystone-user-job --debug --version $VERSION \ +helm install kolla/cinder-create-keystone-user-job --version $VERSION \ --namespace kolla --name cinder-create-keystone-user --set "$common_vars" -helm install kolla/neutron-create-keystone-user-job --debug --version $VERSION \ - --namespace kolla --name neutron-create-keystone-user --set "$common_vars" - -helm install kolla/nova-create-keystone-user-job --debug --version $VERSION \ +helm install kolla/nova-create-keystone-user-job --version $VERSION \ --namespace kolla --name nova-create-keystone-user --set "$common_vars" kollakube res create bootstrap \ @@ -163,19 +153,12 @@ helm install kolla/cinder-create-keystone-endpoint-public-job --version $VERSION helm install kolla/cinder-create-keystone-endpoint-publicv2-job --version $VERSION \ --namespace kolla --name cinder-create-keystone-endpoint-publicv2 --set "$common_vars,external_vip=172.18.0.1" -helm install kolla/neutron-create-keystone-endpoint-public-job --version $VERSION \ - --namespace kolla --name neutron-create-keystone-endpoint-public --set "$common_vars,external_vip=172.18.0.1" -helm install kolla/neutron-create-keystone-endpoint-internal-job --version $VERSION \ - --namespace kolla --name neutron-create-keystone-endpoint-internal --set "$common_vars" -helm install kolla/neutron-create-keystone-endpoint-admin-job --version $VERSION \ - --namespace kolla --name neutron-create-keystone-endpoint-admin --set "$common_vars" - $DIR/tools/wait_for_pods.sh kolla kollakube res delete bootstrap \ nova-create-keystone-endpoint-public -for x in cinder neutron nova; do +for x in cinder nova; do helm delete --purge $x-create-keystone-user done @@ -204,7 +187,7 @@ helm install kolla/cinder-create-keystone-endpoint-admin-job --version $VERSION helm install kolla/cinder-create-keystone-endpoint-adminv2-job --version $VERSION \ --namespace kolla --name cinder-create-keystone-endpoint-adminv2 --set "$common_vars" -for x in nova nova-api neutron; do +for x in nova nova-api; do helm install kolla/$x-create-db-job --version $VERSION \ --set $common_vars,element_name=$x --namespace kolla \ --name $x-create-db @@ -213,7 +196,7 @@ done $DIR/tools/pull_containers.sh kolla $DIR/tools/wait_for_pods.sh kolla -for x in nova-api neutron; do +for x in nova-api; do helm install kolla/$x-manage-db-job --version $VERSION \ --set $common_vars,element_name=$x --namespace kolla \ --name $x-manage-db @@ -231,11 +214,11 @@ $DIR/tests/bin/endpoint_test.sh [ -d "$WORKSPACE/logs" ] && openstack catalog list > \ $WORKSPACE/logs/openstack-catalog-after-bootstrap.json || true -for x in nova nova-api cinder neutron; do +for x in nova nova-api cinder; do helm delete --purge $x-create-db done -for x in nova-api cinder neutron; do +for x in nova-api cinder; do helm delete --purge $x-manage-db done @@ -243,7 +226,7 @@ kollakube res delete bootstrap \ nova-create-keystone-endpoint-internal \ nova-create-keystone-endpoint-admin \ -for x in neutron cinder; do +for x in cinder; do helm delete --purge $x-create-keystone-service helm delete --purge $x-create-keystone-endpoint-public helm delete --purge $x-create-keystone-endpoint-internal @@ -267,10 +250,31 @@ helm install kolla/cinder-scheduler-statefulset --version $VERSION \ --set "$common_vars,element_name=cinder-scheduler" \ --namespace kolla --name cinder-scheduler -helm install kolla/glance --debug --version $VERSION \ +helm install kolla/glance --version $VERSION \ --namespace kolla --name glance --set "$common_vars,element_name=glance" \ --values <(helm_entrypoint_general $1) +helm install kolla/openvswitch-ovsdb-daemonset --version $VERSION \ +--set "$common_vars,type=network,selector_key=kolla_controller" \ +--namespace kolla --name openvswitch-ovsdb-network && +helm install kolla/openvswitch-vswitchd-daemonset --version $VERSION \ +--set $common_vars,kube_logger=false,type=network,selector_key=kolla_controller \ +--namespace kolla --name openvswitch-vswitchd-network + +$DIR/tools/pull_containers.sh kolla +$DIR/tools/wait_for_pods.sh kolla + +kollakube res create bootstrap openvswitch-set-external-ip + +$DIR/tools/pull_containers.sh kolla +$DIR/tools/wait_for_pods.sh kolla + +helm install kolla/neutron --version $VERSION \ + --namespace kolla --name neutron --values <(helm_entrypoint_general) + +$DIR/tools/pull_containers.sh kolla +$DIR/tools/wait_for_pods.sh kolla + helm ls for x in nova-api nova-novncproxy; do @@ -289,39 +293,9 @@ helm install kolla/horizon-deployment --version $VERSION \ --set "$common_vars,element_name=horizon" \ --namespace kolla --name horizon-deployment -helm install kolla/neutron-server-deployment --version $VERSION \ - --set "$common_vars" \ - --namespace kolla --name neutron-server - $DIR/tools/pull_containers.sh kolla $DIR/tools/wait_for_pods.sh kolla -helm install kolla/neutron-dhcp-agent-daemonset --version $VERSION \ - --set "$common_vars,tunnel_interface=$tunnel_interface" \ - --namespace kolla --name neutron-dhcp-agent-daemonset - -helm install kolla/neutron-metadata-agent-daemonset --version $VERSION \ - --set "$common_vars,type=network" \ - --namespace kolla --name neutron-metadata-agent-network - -helm install kolla/neutron-l3-agent-daemonset --version $VERSION \ - --set "$common_vars,type=network,tunnel_interface=$tunnel_interface" \ - --namespace kolla --name neutron-l3-agent-network - -helm install kolla/neutron-openvswitch-agent-daemonset --version $VERSION \ - --set "$common_vars,type=network,tunnel_interface=$tunnel_interface" \ - --namespace kolla --name neutron-openvswitch-agent-network - -helm install kolla/openvswitch-ovsdb-daemonset --version $VERSION \ - --set "$common_vars,type=network,selector_key=kolla_controller" \ - --namespace kolla --name openvswitch-ovsdb-network - -helm install kolla/openvswitch-vswitchd-daemonset --version $VERSION \ - --set $common_vars,type=network,selector_key=kolla_controller \ - --namespace kolla --name openvswitch-vswitchd-network - -kollakube res create bootstrap openvswitch-set-external-ip - helm install kolla/nova-libvirt-daemonset --version $VERSION \ --set "$common_vars,ceph_backend=true,element_name=nova-libvirt" \ --namespace kolla --name nova-libvirt-daemonset diff --git a/tests/bin/gate_capture_logs.sh b/tests/bin/gate_capture_logs.sh index 57fde71b1..f7ad0c81e 100755 --- a/tests/bin/gate_capture_logs.sh +++ b/tests/bin/gate_capture_logs.sh @@ -47,6 +47,12 @@ kubectl get pods -a --all-namespaces -o json | jq -r \ kubectl logs $NAME -c $CON --namespace $NAMESPACE > \ $WORKSPACE/logs/pods/$NAMESPACE-$NAME-$CON.txt done + kubectl get pod $NAME --namespace $NAMESPACE -o json | jq -r \ + '.metadata.annotations."pod.beta.kubernetes.io/init-containers"' \ + | grep -v '^null$' | jq -r '.[].name' | while read CON; do + kubectl logs $NAME -c $CON --namespace $NAMESPACE > \ + $WORKSPACE/logs/pods/$NAMESPACE-$NAME-$CON.txt + done done kubectl get svc -o json --all-namespaces | jq -r \ '.items[].metadata | .namespace + " " + .name' | while read line; do