Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ovf keys for registry port #1642

Merged
1 commit merged into from Apr 24, 2018
Merged

Rename ovf keys for registry port #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions installer/build/bootable/config/builder.ovf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
<ProductSection ovf:class="registry" ovf:required="false">
<Info>Registry Properties</Info>
<Category>3. Registry Configuration</Category>
<Property ovf:key="port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="443">
<Property ovf:key="registry_port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="443">
<Label>3.1. Registry Port</Label>
<Description>Specifies the port on which registry will be published.</Description>
</Property>
Expand All @@ -262,7 +262,7 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
<ProductSection ovf:class="management_portal" ovf:required="false">
<Info>Management Portal Properties</Info>
<Category>4. Management Portal Configuration</Category>
<Property ovf:key="port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="8282">
<Property ovf:key="management_portal_port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="8282">
<Label>4.1. Management Portal Port</Label>
<Description>Specifies the port on which Management Portal will be published.</Description>
</Property>
Expand Down
4 changes: 2 additions & 2 deletions installer/build/scripts/systemd/scripts/vic-appliance-environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ APPLIANCE_TLS_CERT="$(ovfenv -k appliance.tls_cert | sed -E ':a;N;$!ba;s/\r{0,1}
APPLIANCE_TLS_PRIVATE_KEY="$(ovfenv -k appliance.tls_cert_key | sed -E ':a;N;$!ba;s/\r{0,1}\n//g')"
APPLIANCE_TLS_CA_CERT="$(ovfenv -k appliance.ca_cert | sed -E ':a;N;$!ba;s/\r{0,1}\n//g')"

ADMIRAL_PORT="$(ovfenv -k management_portal.port)"
REGISTRY_PORT="$(ovfenv -k registry.port)"
ADMIRAL_PORT="$(ovfenv -k management_portal.management_portal_port)"
REGISTRY_PORT="$(ovfenv -k registry.registry_port)"
NOTARY_PORT="$(ovfenv -k registry.notary_port)"
FILESERVER_PORT="$(ovfenv -k appliance.config_port)"
HOSTNAME=""
Expand Down
4 changes: 2 additions & 2 deletions installer/docs/BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ docker run -it --net=host -v $GOPATH/src/github.com/vmware/vic-product/installer
--net:Network="VM Network" \
--prop:appliance.root_pwd="password" \
--prop:appliance.permit_root_login=True \
--prop:management_portal.port=8282 \
--prop:registry.port=443 \
--prop:management_portal.management_portal_port=8282 \
--prop:registry.registry_port=443 \
/test-bin/$(ls -1t bin | grep "\.ova") \
vi://$VC_USER:$VC_PASSWORD@$VC_IP/$VC_COMPUTE
```
Expand Down
2 changes: 1 addition & 1 deletion installer/fileserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func Init(conf *config) {

if ip, err := ip.FirstIPv4(ip.Eth0Interface); err == nil {
conf.serverHostname = getHostname(ovf, ip)
if port, ok := ovf.Properties["management_portal.port"]; ok {
if port, ok := ovf.Properties["management_portal.management_portal_port"]; ok {
conf.admiralPort = port
}
}
Expand Down
2 changes: 1 addition & 1 deletion installer/fileserver/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func registerWithPSC(ctx context.Context) error {
if err != nil {
return err
}
admiralPort := ovf.Properties["management_portal.port"]
admiralPort := ovf.Properties["management_portal.management_portal_port"]

// Out of the box users
defCreateUsers, foundCreateUsers := ovf.Properties["default_users.create_def_users"]
Expand Down