From aa0d799e02d2b028bd43f82a691f8dc8527a4282 Mon Sep 17 00:00:00 2001 From: Jim Date: Wed, 16 Jan 2019 08:42:17 -0600 Subject: [PATCH] Auto-gen file push (#25) * Submit generated file that is updated by protogen * fix if check for network, outdated file was pulled * Add dind tool installation --- Makefile | 7 +- install-dind.sh | 9 ++ openstack-tenant/agent/api/mexosagent.pb.go | 136 +++++++++++--------- openstack-tenant/agent/server/handlers.go | 4 +- 4 files changed, 89 insertions(+), 67 deletions(-) create mode 100755 install-dind.sh diff --git a/Makefile b/Makefile index 26c8e5399..9db9574ad 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -all: build +all: build install-dind linux: build-linux @@ -8,3 +8,8 @@ build: build-linux: make -C ./openstack-tenant/agent/ linux + +install-dind: + ./install-dind.sh + + diff --git a/install-dind.sh b/install-dind.sh new file mode 100755 index 000000000..eb768a545 --- /dev/null +++ b/install-dind.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ ! -e /usr/local/bin/dind-cluster-v1.13.sh ]; then + wget https://github.com/kubernetes-sigs/kubeadm-dind-cluster/releases/download/v0.1.0/dind-cluster-v1.13.sh + mv dind-cluster-v1.13.sh /usr/local/bin/ + chmod +x /usr/local/bin/dind-cluster-v1.13.sh +else + echo "dind-cluster-v1.13.sh already installed" +fi diff --git a/openstack-tenant/agent/api/mexosagent.pb.go b/openstack-tenant/agent/api/mexosagent.pb.go index 4e1249119..4f4515813 100644 --- a/openstack-tenant/agent/api/mexosagent.pb.go +++ b/openstack-tenant/agent/api/mexosagent.pb.go @@ -45,7 +45,7 @@ func (m *Provision) Reset() { *m = Provision{} } func (m *Provision) String() string { return proto.CompactTextString(m) } func (*Provision) ProtoMessage() {} func (*Provision) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{0} + return fileDescriptor_mexosagent_5395812191b92a69, []int{0} } func (m *Provision) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Provision.Unmarshal(m, b) @@ -154,7 +154,7 @@ func (m *ProvisionRequest) Reset() { *m = ProvisionRequest{} } func (m *ProvisionRequest) String() string { return proto.CompactTextString(m) } func (*ProvisionRequest) ProtoMessage() {} func (*ProvisionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{1} + return fileDescriptor_mexosagent_5395812191b92a69, []int{1} } func (m *ProvisionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProvisionRequest.Unmarshal(m, b) @@ -200,7 +200,7 @@ func (m *ProvisionResponse) Reset() { *m = ProvisionResponse{} } func (m *ProvisionResponse) String() string { return proto.CompactTextString(m) } func (*ProvisionResponse) ProtoMessage() {} func (*ProvisionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{2} + return fileDescriptor_mexosagent_5395812191b92a69, []int{2} } func (m *ProvisionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProvisionResponse.Unmarshal(m, b) @@ -245,7 +245,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{3} + return fileDescriptor_mexosagent_5395812191b92a69, []int{3} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatusRequest.Unmarshal(m, b) @@ -286,7 +286,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{4} + return fileDescriptor_mexosagent_5395812191b92a69, []int{4} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatusResponse.Unmarshal(m, b) @@ -347,7 +347,7 @@ func (m *Proxy) Reset() { *m = Proxy{} } func (m *Proxy) String() string { return proto.CompactTextString(m) } func (*Proxy) ProtoMessage() {} func (*Proxy) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{5} + return fileDescriptor_mexosagent_5395812191b92a69, []int{5} } func (m *Proxy) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Proxy.Unmarshal(m, b) @@ -400,7 +400,7 @@ func (m *ProxyRequest) Reset() { *m = ProxyRequest{} } func (m *ProxyRequest) String() string { return proto.CompactTextString(m) } func (*ProxyRequest) ProtoMessage() {} func (*ProxyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{6} + return fileDescriptor_mexosagent_5395812191b92a69, []int{6} } func (m *ProxyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProxyRequest.Unmarshal(m, b) @@ -452,7 +452,7 @@ func (m *NginxPort) Reset() { *m = NginxPort{} } func (m *NginxPort) String() string { return proto.CompactTextString(m) } func (*NginxPort) ProtoMessage() {} func (*NginxPort) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{7} + return fileDescriptor_mexosagent_5395812191b92a69, []int{7} } func (m *NginxPort) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NginxPort.Unmarshal(m, b) @@ -531,7 +531,8 @@ func (m *NginxPort) GetInternal() string { type NginxRequest struct { Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` - Ports []*NginxPort `protobuf:"bytes,3,rep,name=ports" json:"ports,omitempty"` + Network string `protobuf:"bytes,3,opt,name=network" json:"network,omitempty"` + Ports []*NginxPort `protobuf:"bytes,4,rep,name=ports" json:"ports,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -541,7 +542,7 @@ func (m *NginxRequest) Reset() { *m = NginxRequest{} } func (m *NginxRequest) String() string { return proto.CompactTextString(m) } func (*NginxRequest) ProtoMessage() {} func (*NginxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{8} + return fileDescriptor_mexosagent_5395812191b92a69, []int{8} } func (m *NginxRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NginxRequest.Unmarshal(m, b) @@ -575,6 +576,13 @@ func (m *NginxRequest) GetName() string { return "" } +func (m *NginxRequest) GetNetwork() string { + if m != nil { + return m.Network + } + return "" +} + func (m *NginxRequest) GetPorts() []*NginxPort { if m != nil { return m.Ports @@ -594,7 +602,7 @@ func (m *NginxResponse) Reset() { *m = NginxResponse{} } func (m *NginxResponse) String() string { return proto.CompactTextString(m) } func (*NginxResponse) ProtoMessage() {} func (*NginxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{9} + return fileDescriptor_mexosagent_5395812191b92a69, []int{9} } func (m *NginxResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NginxResponse.Unmarshal(m, b) @@ -640,7 +648,7 @@ func (m *ProxyResponse) Reset() { *m = ProxyResponse{} } func (m *ProxyResponse) String() string { return proto.CompactTextString(m) } func (*ProxyResponse) ProtoMessage() {} func (*ProxyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{10} + return fileDescriptor_mexosagent_5395812191b92a69, []int{10} } func (m *ProxyResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProxyResponse.Unmarshal(m, b) @@ -687,7 +695,7 @@ func (m *Route) Reset() { *m = Route{} } func (m *Route) String() string { return proto.CompactTextString(m) } func (*Route) ProtoMessage() {} func (*Route) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{11} + return fileDescriptor_mexosagent_5395812191b92a69, []int{11} } func (m *Route) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Route.Unmarshal(m, b) @@ -740,7 +748,7 @@ func (m *RouteRequest) Reset() { *m = RouteRequest{} } func (m *RouteRequest) String() string { return proto.CompactTextString(m) } func (*RouteRequest) ProtoMessage() {} func (*RouteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{12} + return fileDescriptor_mexosagent_5395812191b92a69, []int{12} } func (m *RouteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RouteRequest.Unmarshal(m, b) @@ -786,7 +794,7 @@ func (m *RouteResponse) Reset() { *m = RouteResponse{} } func (m *RouteResponse) String() string { return proto.CompactTextString(m) } func (*RouteResponse) ProtoMessage() {} func (*RouteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mexosagent_c5077fcecf689775, []int{13} + return fileDescriptor_mexosagent_5395812191b92a69, []int{13} } func (m *RouteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RouteResponse.Unmarshal(m, b) @@ -1074,53 +1082,53 @@ var _MexOSAgent_serviceDesc = grpc.ServiceDesc{ Metadata: "api/mexosagent.proto", } -func init() { proto.RegisterFile("api/mexosagent.proto", fileDescriptor_mexosagent_c5077fcecf689775) } - -var fileDescriptor_mexosagent_c5077fcecf689775 = []byte{ - // 709 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0x13, 0x3b, - 0x14, 0x56, 0x92, 0x66, 0xd2, 0x9c, 0x36, 0xbd, 0xad, 0x6f, 0x1b, 0x8d, 0xa2, 0xbb, 0xa8, 0xac, - 0x2e, 0x7a, 0xbb, 0x48, 0x44, 0xd9, 0x75, 0x57, 0xa9, 0x08, 0x24, 0xa0, 0x54, 0x29, 0x4b, 0x36, - 0x2e, 0x71, 0x07, 0xab, 0x89, 0x3d, 0x78, 0x9c, 0x74, 0xca, 0x92, 0x17, 0x60, 0xc1, 0x86, 0xc7, - 0x42, 0x62, 0xc1, 0x0b, 0xf0, 0x20, 0xe8, 0xd8, 0x67, 0x86, 0x99, 0x0a, 0x88, 0x08, 0x3b, 0x7f, - 0x3e, 0xc7, 0xdf, 0xf9, 0xfd, 0x0c, 0xbb, 0x22, 0x55, 0xa3, 0x99, 0xcc, 0x4d, 0x26, 0x12, 0xa9, - 0xdd, 0x30, 0xb5, 0xc6, 0x19, 0xd6, 0x12, 0xa9, 0x1a, 0xfc, 0x97, 0x18, 0x93, 0x4c, 0xe5, 0x08, - 0x3d, 0x84, 0xd6, 0xc6, 0x09, 0xa7, 0x8c, 0xce, 0x82, 0x0b, 0xff, 0xd0, 0x84, 0xee, 0x85, 0x35, - 0x0b, 0x95, 0x29, 0xa3, 0x19, 0x83, 0x35, 0x2d, 0x66, 0x32, 0x6e, 0xec, 0x37, 0x0e, 0xbb, 0x63, - 0x7f, 0x66, 0xbb, 0xd0, 0x56, 0x33, 0x91, 0xc8, 0xb8, 0xe9, 0x2f, 0x03, 0x60, 0x7d, 0x88, 0xae, - 0xa7, 0x62, 0x61, 0x6c, 0xdc, 0xf2, 0xd7, 0x84, 0x58, 0x0c, 0x1d, 0x2d, 0xdd, 0xad, 0xb1, 0x37, - 0xf1, 0x9a, 0x37, 0x14, 0x10, 0x2d, 0xd7, 0x2a, 0x97, 0x13, 0x95, 0xc6, 0xed, 0x60, 0x21, 0x88, - 0x96, 0xcc, 0x19, 0x8b, 0x31, 0xa2, 0x60, 0x21, 0x88, 0xf9, 0xbc, 0x33, 0x5a, 0xc6, 0x9d, 0x90, - 0x0f, 0x9e, 0x31, 0xb2, 0x93, 0x5a, 0x68, 0x17, 0xaf, 0x87, 0xc8, 0x01, 0xb1, 0x01, 0xac, 0xcf, - 0xa4, 0x13, 0x13, 0xe1, 0x44, 0xdc, 0xf5, 0x96, 0x12, 0xe3, 0x1b, 0x2b, 0x13, 0x65, 0x74, 0x0c, - 0xe1, 0x4d, 0x40, 0xc8, 0x7f, 0xa3, 0xf4, 0x24, 0xde, 0x08, 0xfc, 0x78, 0xe6, 0xaf, 0x60, 0xbb, - 0x6c, 0xc8, 0x58, 0xbe, 0x9d, 0xcb, 0xcc, 0x61, 0x86, 0x33, 0x99, 0x61, 0x6f, 0xa9, 0x35, 0x05, - 0x64, 0x43, 0x80, 0xb4, 0xf0, 0xce, 0xe2, 0xe6, 0x7e, 0xeb, 0x70, 0xe3, 0x78, 0x6b, 0x28, 0x52, - 0x35, 0xfc, 0x41, 0x52, 0xf1, 0xe0, 0x8f, 0x60, 0xa7, 0xc2, 0x9e, 0xa5, 0x46, 0x67, 0xf2, 0x37, - 0xf4, 0x7d, 0x88, 0x32, 0x27, 0xdc, 0x3c, 0xa3, 0xee, 0x13, 0xe2, 0xff, 0x43, 0xef, 0xd2, 0x9f, - 0x96, 0x66, 0xc8, 0x3f, 0x35, 0x60, 0xab, 0xf0, 0x5d, 0x35, 0x1e, 0x3b, 0x80, 0x4e, 0x6a, 0x4d, - 0xae, 0x64, 0x16, 0xb7, 0x7c, 0x8d, 0x50, 0xd4, 0x98, 0xdf, 0x8d, 0x0b, 0xd3, 0xbd, 0x66, 0xac, - 0x2d, 0x6d, 0xc6, 0x63, 0x68, 0x7b, 0x86, 0x9f, 0xee, 0x5d, 0x1f, 0x22, 0x63, 0x55, 0xa2, 0x74, - 0x91, 0x4a, 0x40, 0xe8, 0x9b, 0x0a, 0xf7, 0x86, 0xf6, 0xce, 0x9f, 0xf9, 0x39, 0x6c, 0x86, 0x54, - 0x96, 0xce, 0xab, 0x52, 0x48, 0xf3, 0x97, 0x85, 0xf0, 0xaf, 0x0d, 0xe8, 0x9e, 0x27, 0x4a, 0xe7, - 0x17, 0xc6, 0xba, 0xbf, 0xcd, 0x0e, 0x37, 0x53, 0xe6, 0x4e, 0x5a, 0x2d, 0xa6, 0x24, 0x8a, 0x12, - 0xa3, 0xcd, 0x0b, 0xf1, 0xb5, 0x99, 0x92, 0x2c, 0x4a, 0x1c, 0x36, 0x3a, 0xf7, 0x90, 0x84, 0x51, - 0x62, 0xb4, 0x59, 0x39, 0x33, 0x4e, 0xaa, 0x94, 0xd4, 0x51, 0x62, 0xb4, 0x29, 0x4d, 0xf1, 0x82, - 0x46, 0x4a, 0xcc, 0xaf, 0x60, 0xd3, 0x17, 0xb6, 0xbc, 0x53, 0x45, 0xd5, 0xcd, 0x4a, 0xd5, 0x07, - 0xd0, 0x4e, 0x8d, 0x75, 0xc5, 0x12, 0x84, 0xd9, 0x96, 0x8d, 0x1a, 0x07, 0x23, 0x3f, 0x85, 0x1e, - 0xc5, 0x58, 0x79, 0xbf, 0x4f, 0xa1, 0x47, 0x03, 0x5d, 0x99, 0xe2, 0x29, 0xb4, 0xc7, 0x66, 0xee, - 0x82, 0xc3, 0xfc, 0x4a, 0x4b, 0x47, 0x2f, 0x09, 0x21, 0x65, 0x22, 0x9c, 0xbc, 0x15, 0x77, 0xf4, - 0xb2, 0x80, 0x6c, 0x1b, 0x5a, 0x13, 0xb9, 0xa0, 0x19, 0xe2, 0x91, 0x3f, 0x83, 0x4d, 0x4f, 0xb6, - 0xbc, 0x6d, 0x1c, 0x22, 0x8b, 0x9e, 0xf5, 0xfd, 0x0a, 0x8f, 0xc9, 0x82, 0xd5, 0x11, 0xdb, 0xaa, - 0xd5, 0x1d, 0x7f, 0x6e, 0x01, 0x3c, 0x97, 0xf9, 0x8b, 0xcb, 0x53, 0xfc, 0xef, 0xd9, 0xcb, 0xea, - 0x2f, 0xbe, 0x77, 0x4f, 0x72, 0x21, 0xe7, 0x41, 0xff, 0xfe, 0x75, 0x08, 0xce, 0xe3, 0xf7, 0x5f, - 0xbe, 0x7d, 0x6c, 0x32, 0xde, 0x1b, 0x2d, 0x1e, 0x8c, 0x4a, 0x75, 0x9e, 0x34, 0x8e, 0xd8, 0x05, - 0x74, 0xce, 0x64, 0xe6, 0xac, 0xb9, 0xfb, 0x53, 0xce, 0xbe, 0xe7, 0xdc, 0xe6, 0x1b, 0xc8, 0x39, - 0x09, 0x1c, 0xc8, 0x78, 0x56, 0x28, 0x7e, 0xa7, 0x22, 0x3b, 0xe2, 0x62, 0xd5, 0x2b, 0xe2, 0xd9, - 0xf5, 0x3c, 0x5b, 0xbc, 0x4b, 0xb9, 0xe5, 0x05, 0x4b, 0x18, 0xed, 0x4e, 0xa5, 0xb9, 0x35, 0x96, - 0x5a, 0x7b, 0xeb, 0x2c, 0x7e, 0x06, 0xc8, 0xf2, 0x04, 0xa2, 0xf0, 0x2f, 0xb2, 0xf0, 0xa6, 0xf6, - 0xa1, 0x0e, 0xfe, 0xad, 0xdd, 0x11, 0xd1, 0x9e, 0x27, 0xfa, 0x87, 0x03, 0x12, 0x85, 0x49, 0x50, - 0x3e, 0x7e, 0xe1, 0x29, 0x9f, 0xaa, 0xc0, 0x28, 0x9f, 0x9a, 0x1e, 0xea, 0xf9, 0x68, 0x34, 0x9d, - 0x34, 0x8e, 0xae, 0x22, 0xaf, 0xec, 0x87, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xc9, 0x60, - 0x65, 0xcc, 0x07, 0x00, 0x00, +func init() { proto.RegisterFile("api/mexosagent.proto", fileDescriptor_mexosagent_5395812191b92a69) } + +var fileDescriptor_mexosagent_5395812191b92a69 = []byte{ + // 715 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6e, 0x13, 0x3d, + 0x10, 0x56, 0xb2, 0xcd, 0xa6, 0x99, 0x36, 0xfd, 0x5b, 0xff, 0x6d, 0x64, 0x45, 0x1c, 0x2a, 0xab, + 0x87, 0xd2, 0x43, 0x22, 0xca, 0xad, 0xb7, 0x4a, 0x45, 0x20, 0x01, 0xa5, 0x4a, 0x39, 0x72, 0x71, + 0x89, 0xbb, 0x58, 0x4d, 0xec, 0xc5, 0xeb, 0xa4, 0x5b, 0xc4, 0x89, 0x17, 0xe0, 0xc0, 0x85, 0xc7, + 0x42, 0xe2, 0xc0, 0x0b, 0xf0, 0x20, 0xc8, 0xf6, 0xec, 0xb2, 0x1b, 0x01, 0x11, 0xe1, 0xe6, 0xcf, + 0x33, 0xfe, 0xfc, 0xcd, 0x78, 0xbe, 0x5d, 0xd8, 0xe5, 0xa9, 0x1c, 0x4e, 0x45, 0xae, 0x33, 0x9e, + 0x08, 0x65, 0x07, 0xa9, 0xd1, 0x56, 0x93, 0x88, 0xa7, 0xb2, 0x7f, 0x2f, 0xd1, 0x3a, 0x99, 0x88, + 0xa1, 0xcb, 0xe0, 0x4a, 0x69, 0xcb, 0xad, 0xd4, 0x2a, 0x0b, 0x29, 0xec, 0x63, 0x13, 0x3a, 0x17, + 0x46, 0xcf, 0x65, 0x26, 0xb5, 0x22, 0x04, 0xd6, 0x14, 0x9f, 0x0a, 0xda, 0xd8, 0x6f, 0x1c, 0x76, + 0x46, 0x7e, 0x4d, 0x76, 0xa1, 0x25, 0xa7, 0x3c, 0x11, 0xb4, 0xe9, 0x37, 0x03, 0x20, 0x3d, 0x88, + 0xaf, 0x27, 0x7c, 0xae, 0x0d, 0x8d, 0xfc, 0x36, 0x22, 0x42, 0xa1, 0xad, 0x84, 0xbd, 0xd5, 0xe6, + 0x86, 0xae, 0xf9, 0x40, 0x01, 0x5d, 0xe4, 0x5a, 0xe6, 0x62, 0x2c, 0x53, 0xda, 0x0a, 0x11, 0x84, + 0x2e, 0x92, 0x59, 0x6d, 0xdc, 0x1d, 0x71, 0x88, 0x20, 0x74, 0x7a, 0xde, 0x69, 0x25, 0x68, 0x3b, + 0xe8, 0x71, 0x6b, 0x77, 0xb3, 0x15, 0x8a, 0x2b, 0x4b, 0xd7, 0xc3, 0xcd, 0x01, 0x91, 0x3e, 0xac, + 0x4f, 0x85, 0xe5, 0x63, 0x6e, 0x39, 0xed, 0xf8, 0x48, 0x89, 0xdd, 0x19, 0x23, 0x12, 0xa9, 0x15, + 0x85, 0x70, 0x26, 0x20, 0xc7, 0x7f, 0x23, 0xd5, 0x98, 0x6e, 0x04, 0x7e, 0xb7, 0x66, 0xaf, 0x60, + 0xbb, 0x6c, 0xc8, 0x48, 0xbc, 0x9d, 0x89, 0xcc, 0x3a, 0x85, 0x53, 0x91, 0xb9, 0xde, 0x62, 0x6b, + 0x0a, 0x48, 0x06, 0x00, 0x69, 0x91, 0x9d, 0xd1, 0xe6, 0x7e, 0x74, 0xb8, 0x71, 0xbc, 0x35, 0xe0, + 0xa9, 0x1c, 0xfc, 0x24, 0xa9, 0x64, 0xb0, 0x47, 0xb0, 0x53, 0x61, 0xcf, 0x52, 0xad, 0x32, 0xf1, + 0x07, 0xfa, 0x1e, 0xc4, 0x99, 0xe5, 0x76, 0x96, 0x61, 0xf7, 0x11, 0xb1, 0xfb, 0xd0, 0xbd, 0xf4, + 0xab, 0xa5, 0x0a, 0xd9, 0xe7, 0x06, 0x6c, 0x15, 0xb9, 0xab, 0xde, 0x47, 0x0e, 0xa0, 0x9d, 0x1a, + 0x9d, 0x4b, 0x91, 0xd1, 0xc8, 0xd7, 0x08, 0x45, 0x8d, 0xf9, 0xdd, 0xa8, 0x08, 0x2d, 0x34, 0x63, + 0x6d, 0x69, 0x33, 0x1e, 0x43, 0xcb, 0x33, 0xfc, 0x72, 0xee, 0x7a, 0x10, 0x6b, 0x23, 0x13, 0xa9, + 0x0a, 0x29, 0x01, 0xb9, 0xdc, 0x94, 0xdb, 0x37, 0x38, 0x77, 0x7e, 0xcd, 0xce, 0x61, 0x33, 0x48, + 0x59, 0xfa, 0x5e, 0x95, 0x42, 0x9a, 0xbf, 0x2d, 0x84, 0x7d, 0x6b, 0x40, 0xe7, 0x3c, 0x91, 0x2a, + 0xbf, 0xd0, 0xc6, 0xfe, 0xab, 0x3a, 0x37, 0x99, 0x22, 0xb7, 0xc2, 0x28, 0x3e, 0x41, 0x53, 0x94, + 0xd8, 0xc5, 0xbc, 0x11, 0x5f, 0xeb, 0x09, 0xda, 0xa2, 0xc4, 0x61, 0xa2, 0x73, 0x0f, 0xd1, 0x18, + 0x25, 0x76, 0x31, 0x23, 0xa6, 0xda, 0x0a, 0x99, 0xa2, 0x3b, 0x4a, 0xec, 0x62, 0x52, 0xe1, 0x7d, + 0xc1, 0x23, 0x25, 0x66, 0xef, 0x61, 0xd3, 0x17, 0xb6, 0xbc, 0x53, 0x45, 0xd5, 0xcd, 0x4a, 0xd5, + 0x15, 0x77, 0x47, 0x75, 0x77, 0x1f, 0x40, 0x2b, 0xd5, 0xc6, 0xd6, 0x5f, 0xbd, 0x6c, 0xe1, 0x28, + 0x04, 0xd9, 0x29, 0x74, 0xf1, 0xf6, 0x95, 0x27, 0xff, 0x14, 0xba, 0xf8, 0xd4, 0x2b, 0x53, 0x3c, + 0x85, 0xd6, 0x48, 0xcf, 0x6c, 0x48, 0x98, 0x5d, 0x29, 0x61, 0xf1, 0x24, 0x22, 0x47, 0x99, 0x70, + 0x2b, 0x6e, 0xf9, 0x1d, 0x9e, 0x2c, 0x20, 0xd9, 0x86, 0x68, 0x2c, 0xe6, 0x58, 0xbc, 0x5b, 0xb2, + 0x67, 0xb0, 0xe9, 0xc9, 0x96, 0x37, 0x94, 0x41, 0x6c, 0x5c, 0x66, 0x7d, 0xf2, 0xc2, 0x61, 0x8c, + 0xb8, 0xea, 0x90, 0x6d, 0xd5, 0xea, 0x8e, 0xbf, 0x44, 0x00, 0xcf, 0x45, 0xfe, 0xe2, 0xf2, 0xd4, + 0xfd, 0x09, 0xc8, 0xcb, 0xea, 0xf7, 0x7d, 0x6f, 0xc1, 0x8c, 0x41, 0x73, 0xbf, 0xb7, 0xb8, 0x1d, + 0x2e, 0x67, 0xf4, 0xc3, 0xd7, 0xef, 0x9f, 0x9a, 0x84, 0x75, 0x87, 0xf3, 0x07, 0xc3, 0xd2, 0xb7, + 0x27, 0x8d, 0x23, 0x72, 0x01, 0xed, 0x33, 0x91, 0x59, 0xa3, 0xef, 0xfe, 0x96, 0xb3, 0xe7, 0x39, + 0xb7, 0xd9, 0x86, 0xe3, 0x1c, 0x07, 0x0e, 0xc7, 0x78, 0x56, 0x7c, 0x0b, 0x76, 0x2a, 0x86, 0x44, + 0x2e, 0x52, 0xdd, 0x42, 0x9e, 0x5d, 0xcf, 0xb3, 0xc5, 0x3a, 0xa8, 0x2d, 0x2f, 0x58, 0xc2, 0xd3, + 0xee, 0x54, 0x9a, 0x5b, 0x63, 0xa9, 0xb5, 0xb7, 0xce, 0xe2, 0xdf, 0xc0, 0xb1, 0x3c, 0x81, 0x38, + 0x7c, 0x31, 0x49, 0x38, 0x53, 0xfb, 0xd4, 0xf6, 0xff, 0xaf, 0xed, 0x21, 0xd1, 0x9e, 0x27, 0xfa, + 0x8f, 0x81, 0x23, 0x0a, 0x2f, 0x81, 0x7a, 0xfc, 0xc0, 0xa3, 0x9e, 0xaa, 0xf5, 0x50, 0x4f, 0xcd, + 0x0f, 0x75, 0x3d, 0xca, 0x85, 0x4e, 0x1a, 0x47, 0x57, 0xb1, 0xf7, 0xfc, 0xc3, 0x1f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x71, 0x56, 0xaa, 0x68, 0xe6, 0x07, 0x00, 0x00, } diff --git a/openstack-tenant/agent/server/handlers.go b/openstack-tenant/agent/server/handlers.go index 500b4b994..eda80c6e1 100644 --- a/openstack-tenant/agent/server/handlers.go +++ b/openstack-tenant/agent/server/handlers.go @@ -374,7 +374,7 @@ func fileExists(name string) bool { // CreateNginx creates an nginx container with the specified name and optional network // with the specified ports func CreateNginx(name string, network string, ports []*api.NginxPort) error { - log.Debugln("create nginx", name, ports) + log.Debugln("create nginx", "name", name, "network", network, "ports", ports) pwd, err := os.Getwd() if err != nil { log.Debugln("can't get cwd", err) @@ -427,7 +427,7 @@ func CreateNginx(name string, network string, ports []*api.NginxPort) error { } cmdArgs := []string{"run", "-d", "--rm", "--name", name} - if network == "" { + if network != "" { // when runnning in DIND it cannot use host mode and so must expose the ports cmdArgs = append(cmdArgs, "--network", network) for _, p := range ports {