Remove Demo VCH Installer Wizard (#1222) (#1244)

installer/Makefile

@@ -35,30 +35,27 @@ LDFLAGS := $(shell BUILD_NUMBER=${BUILD_NUMBER} $(BASE_DIR)/scripts/version-link
 ovfenv := $(BIN)/ovfenv
 vic-ova-ui := $(BIN)/vic-ova-ui
 ova-webserver := $(BIN)/ova-webserver
-ova-engine-installer := $(BIN)/ova-engine-installer
 toolbox := $(BIN)/toolbox
 rpctool := $(BIN)/rpctool
 gas: $(GAS)
 ovfenv: $(ovfenv)
 vic-ova-ui: $(vic-ova-ui)
 ova-webserver: $(ova-webserver)
-ova-engine-installer: $(ova-engine-installer)
 toolbox: $(toolbox)
 rpctool: $(rpctool)
 tools: $(DEP) $(GOLINT) $(GAS)
-all: golint gofmt govet gas $(ovfenv) $(vic-ova-ui) $(ova-webserver) $(ova-engine-installer) $(toolbox) $(rpctool)
+all: golint gofmt govet gas $(ovfenv) $(vic-ova-ui) $(ova-webserver) $(toolbox) $(rpctool)
 
 vendor: $(DEP)
 	@echo restoring vendor
 	$(DEP) ensure
 
 gas: $(GAS)
 	@echo running go AST tool
-	@$(GAS) -quiet engine_installer/... fileserver/... lib/... ovatools/... pkg/... tagvm/... toolbox/... 2> /dev/null
+	@$(GAS) -quiet fileserver/... lib/... ovatools/... pkg/... tagvm/... toolbox/... 2> /dev/null
 
 golint: $(GOLINT)
 	@echo checking go lint...
-	@$(call golintf,github.com/vmware/vic-product/installer/engine_installer/...)
 	@$(call golintf,github.com/vmware/vic-product/installer/fileserver/...)
 	@$(call golintf,github.com/vmware/vic-product/installer/lib/...)
 	@$(call golintf,github.com/vmware/vic-product/installer/ovatools/...)
@@ -114,10 +111,6 @@ $(ova-webserver): $(call godeps,fileserver/*.go)
 	@echo building ova-webserver
 	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
 
-$(ova-engine-installer): $(call godeps,engine_installer/*.go)
-	@echo building ova-engine-installer
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
 $(toolbox): $(call godeps,toolbox/*.go)
 	@echo building toolbox
 	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)

installer/build/ova-manifest.json

@@ -22,11 +22,6 @@
       "source": "../bin/ova-webserver",
       "destination": "/usr/local/bin/ova-webserver"
     },
-    {
-      "type": "file",
-      "source": "../bin/ova-engine-installer",
-      "destination": "/usr/local/bin/ova-engine-installer"
-    },
     {
       "type": "file",
       "source": "../bin/toolbox",
@@ -314,35 +309,6 @@
       "source": "../fileserver/files/open_source_license.txt",
       "destination": "/opt/vmware/fileserver/files/open_source_license.txt"
     },
-    {
-      "type": "shell",
-      "script": "scripts/provision_engine_installer.sh"
-    },
-    {
-      "type": "file",
-      "source": "scripts/systemd/engine_installer/engine_installer_startup.service",
-      "destination": "/usr/lib/systemd/system/engine_installer_startup.service"
-    },
-    {
-      "type": "file",
-      "source": "scripts/systemd/engine_installer/engine_installer.service",
-      "destination": "/usr/lib/systemd/system/engine_installer.service"
-    },
-    {
-      "type": "file",
-      "source": "scripts/engine_installer/configure_engine_installer.sh",
-      "destination": "/etc/vmware/engine_installer/configure_engine_installer.sh"
-    },
-    {
-      "type": "file",
-      "source": "scripts/engine_installer/start_engine_installer.sh",
-      "destination": "/etc/vmware/engine_installer/start_engine_installer.sh"
-    },
-    {
-      "type": "file",
-      "source": "../engine_installer/html",
-      "destination": "/opt/vmware/engine_installer/html"
-    },
     {
       "type": "shell",
       "script": "scripts/system_settings.sh"

installer/build/scripts/system_settings.sh

@@ -29,7 +29,6 @@ systemctl enable ovf-network.service ova-firewall.service
 
 systemctl enable harbor_startup.path admiral_startup.path get_token.timer
 systemctl enable fileserver_startup.service fileserver.service
-systemctl enable engine_installer_startup.service engine_installer.service
 systemctl enable vic_machine_server.service
 
 # Clean up temporary directories

installer/build/scripts/systemd/appliance/vic-appliance-environment.sh

@@ -20,7 +20,6 @@ TLS_CA_CERT="$(ovfenv -k management_portal.ca_cert)"
 ADMIRAL_PORT="$(ovfenv -k management_portal.port)"
 REGISTRY_PORT="$(ovfenv -k registry.port)"
 NOTARY_PORT="$(ovfenv -k registry.notary_port)"
-ENGINE_INSTALLER_PORT="$(ovfenv -k engine_installer.port)"
 FILESERVER_PORT="$(ovfenv -k fileserver.port)"
 
 ENV_FILE="/etc/vmware/environment"
@@ -32,7 +31,6 @@ ENV_FILE="/etc/vmware/environment"
   echo "ADMIRAL_PORT=${ADMIRAL_PORT}";
   echo "REGISTRY_PORT=${REGISTRY_PORT}";
   echo "NOTARY_PORT=${NOTARY_PORT}";
-  echo "ENGINE_INSTALLER_PORT=${ENGINE_INSTALLER_PORT}";
   echo "FILESERVER_PORT=${FILESERVER_PORT}";
   echo "VIC_MACHINE_SERVER_PORT=8443";
 } > ${ENV_FILE}

installer/build/vic-unified.ovf

@@ -279,27 +279,19 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
         <Description>Paste in the content of certificate key file. Leave blank for a generated key.</Description>
       </Property>
     </ProductSection>
-    <ProductSection ovf:class="engine_installer" ovf:required="false">
-      <Info>Demo VCH Installer Wizard Properties</Info>
-      <Category>6. Demo VCH Installer Wizard Configuration</Category>
-      <Property ovf:key="port" ovf:qualifiers="MinValue(1),MaxValue(65535)" ovf:type="int" ovf:userConfigurable="true" ovf:value="1337">
-        <Label>6.1. Demo VCH Installer Wizard Port</Label>
-        <Description>Specifies the port on which Demo VCH Installer Wizard will be published.</Description>
-      </Property>
-    </ProductSection>
     <ProductSection ovf:class="default_users" ovf:required="false">
       <Info>Example Users</Info>
-      <Category>7. Configure Example Users</Category>
+      <Category>6. Configure Example Users</Category>
       <Property ovf:key="create_def_users" ovf:type="boolean" ovf:userConfigurable="true" ovf:value="true">
-        <Label>7.1. Create Example Users</Label>
+        <Label>6.1. Create Example Users</Label>
         <Description>Uncheck to skip creation of Example Users.</Description>
       </Property>
       <Property ovf:key="def_user_prefix" ovf:qualifiers="MinLen(0),MaxLen(64)" ovf:type="string" ovf:userConfigurable="true" ovf:value="vic">
-        <Label>7.2. Username Prefix for Example Users</Label>
+        <Label>6.2. Username Prefix for Example Users</Label>
         <Description>Username prefix to be used to create Example Users for vSphere Integrated Containers.</Description>
       </Property>
       <Property ovf:key="def_user_password" ovf:password="true" ovf:qualifiers="MinLen(0),MaxLen(128)" ovf:type="string" ovf:userConfigurable="true" ovf:value="VicPro!23">
-        <Label>7.3. Password for Example Users</Label>
+        <Label>6.3. Password for Example Users</Label>
         <Description>Password to be used to create Example Users. The password must follow the rules set for vSphere.</Description>
       </Property>
     </ProductSection>