Fix extraneous white space

Change-Id: Iba30a13be4c6973f7d9aaec690e6ef738f8bd2b4
Issue-Id:CCSDK-73
Signed-off-by: Jack Lucas <jflucas@research.att.com>

6 files changed, 36 insertions, 36 deletions

diff --git a/platform_base_installation/README.md b/platform_base_installation/README.md
index 3c782f0..ac68fd5 100644
--- a/platform_base_installation/README.md
+++ b/platform_base_installation/README.md
@@ -29,4 +29,4 @@ External documentation links:
 - The installation process sets up one non-root user on each VM.  The user is configured for access using the keypair provided at installation time.
 - The Cloudify Manager is _not_  set up for highly availability.
 - While Consul _is_ set up in a high-availability configuration, clients need to know the addresses of all three Consul VMs.  In the event that a client cannot reach one of the VMs, the client must try another address.
-- The installation process installs the Web-based user interfaces for both Cloudify Manager and Consul.  This may not desirable for production environments.
\ No newline at end of file
+- The installation process installs the Web-based user interfaces for both Cloudify Manager and Consul.  This may not desirable for production environments.
diff --git a/platform_base_installation/centos_vm.yaml b/platform_base_installation/centos_vm.yaml
index b3a0ce7..8df1a6a 100644
--- a/platform_base_installation/centos_vm.yaml
+++ b/platform_base_installation/centos_vm.yaml
@@ -16,7 +16,7 @@
 # limitations under the License.
 # ============LICENSE_END============================================
 #
-# ECOMP and OpenECOMP are trademarks 
+# ECOMP and OpenECOMP are trademarks
 # and service marks of AT&T Intellectual Property.
 #
 
@@ -28,7 +28,7 @@ imports:
   - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml
   - types/dns_types.yaml
   - types/sshkey_types.yaml
- 
+
 inputs:
   centos7image_id:
     type: string
@@ -112,7 +112,7 @@ inputs:
       systemctl enable consul
       systemctl start consul
       yum install -y python-psycopg2
-      
+
 node_templates:
   key_pair:
     type: cloudify.openstack.nodes.KeyPair
@@ -141,7 +141,7 @@ node_templates:
         extra_dhcp_opts:
           - opt_name: 'domain-name'
             opt_value: { get_input: location_domain }
-      openstack_config: *open_conf   
+      openstack_config: *open_conf
     relationships:
       - type: cloudify.relationships.contained_in
         target: private_net
@@ -184,7 +184,7 @@ node_templates:
                 - { get_attribute: [ floatingip_vm00, floating_ip_address ] }
     relationships:
       - type: cloudify.relationships.depends_on
-        target: floatingip_vm00              
+        target: floatingip_vm00
   dns_cname:
     type: ccsdk.nodes.dns.cnamerecord
     properties:
@@ -218,7 +218,7 @@ node_templates:
                   - { get_input: vm_init_clmg_00 }
                   - { get_input: datacenter }
                   - |+
-                  
+
                   - { get_input: vm_init_clmg_01 }
     relationships:
       - type: cloudify.openstack.server_connected_to_port
diff --git a/platform_base_installation/consul.md b/platform_base_installation/consul.md
index 82f2f61..d092f92 100644
--- a/platform_base_installation/consul.md
+++ b/platform_base_installation/consul.md
@@ -6,10 +6,9 @@ This installation uses Consul 0.8.3.
 Consul is an open source project, and it can be built from source.  For this project, however, we are using a binary distribution provided by Hashicorp (the company responsible for Consul development), pulled from https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip.  The zip file contains a single file, the consul
 binary executable.
 
-
 #### How the installation works
 The installation is driven by a Cloudify blueprint ([`consul_cluster.yaml`](./consul_cluster.yaml)) with a set of inputs describing the OpenStack environment (typically generated by running the `configure-dcae` command as described in
-the [installation instructions](./install.md)).   
+the [installation instructions](./install.md)).
 
 The blueprint creates three virtual machines, each running Ubuntu 16.04.   The blueprint includes an initial shell script that runs when the VM is first booted (the so-called `cloud-init` script).  This shell script:
 - creates the `/opt/consul/bin`, `/opt/consul/data`, and `/opt/consul/config`, and `/opt/consul/data` directories
@@ -27,7 +26,7 @@ The initialization script for the third VM has one additional step, at the very
 After Cloudify finishes with the installation, the [`installer` script](./installer) waits for the Consul API to become available on the first Consul server, and then attempts to register Cloudify Manager as an [external service](https://www.consul.io/docs/guides/external.html) in Consul.  It also puts the address of the first server into the `/opt/env.ini` file on the Cloudify Manager host.  (It puts in one address to maintain consistency with the earlier installation process that installed a single Consul server in a Docker container.  Certain plugins rely on this entry in `/opt/env.ini`, and they expect a single address.  This will eventually change.)
 
 #### Managing Consul
-We don't anticipate a need for hands-on management of Consul.  When a Consul VM is rebooted, Consul will start automatically and will rejoin the Consul cluster.  
+We don't anticipate a need for hands-on management of Consul.  When a Consul VM is rebooted, Consul will start automatically and will rejoin the Consul cluster.
 
 If there's a need to look more closely at what's going on with a Consul VM, logging in and becoming root provides access to the `systemd` tools.  In particular:
 
diff --git a/platform_base_installation/consul_cluster.yaml b/platform_base_installation/consul_cluster.yaml
index f399df3..1c6b7c9 100644
--- a/platform_base_installation/consul_cluster.yaml
+++ b/platform_base_installation/consul_cluster.yaml
@@ -16,7 +16,7 @@
 # limitations under the License.
 # ============LICENSE_END============================================
 #
-# ECOMP and OpenECOMP are trademarks 
+# ECOMP and OpenECOMP are trademarks
 # and service marks of AT&T Intellectual Property.
 #
 
@@ -27,7 +27,7 @@ imports:
   - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml
   - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk }}/type_files/dnsdesig/dns_types.yaml"
   - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk }}/type_files/sshkeyshare/sshkey_types.yaml"
- 
+
 inputs:
   centos7image_id:
     type: string
@@ -190,20 +190,20 @@ node_templates:
                   - { get_input: vm_init_cnsl_00 }
                   - { get_input: datacenter }
                   - |+
-                  
-                  - { get_input: vm_init_cnsl_01 } 
-                  - concat: 
+
+                  - { get_input: vm_init_cnsl_01 }
+                  - concat:
                       - 'until /opt/consul/bin/consul join '
                       - { get_attribute: [host_cnsl01, ip] }
                       - ' '
                       - { get_attribute: [host_cnsl02, ip]}
                       - '; do sleep 15; done'
-    
+
     relationships:
       - type: cloudify.openstack.server_connected_to_port
         target: fixedip_cnsl00
       - type: cloudify.openstack.server_connected_to_security_group
-        target: security_group        
+        target: security_group
       - type: cloudify.openstack.server_connected_to_floating_ip
         target: floatingip_cnsl00
       - type: cloudify.openstack.server_connected_to_keypair
@@ -220,7 +220,7 @@ node_templates:
       port:
         extra_dhcp_opts:
           - opt_name: 'domain-name'
-            opt_value: { get_input: location_domain }    
+            opt_value: { get_input: location_domain }
       openstack_config: *open_conf
     relationships:
       - type: cloudify.relationships.contained_in
@@ -269,8 +269,8 @@ node_templates:
                   - { get_input: vm_init_cnsl_00 }
                   - { get_input: datacenter }
                   - |+
-                  
-                  - { get_input: vm_init_cnsl_01 } 
+
+                  - { get_input: vm_init_cnsl_01 }
     relationships:
       - type: cloudify.openstack.server_connected_to_port
         target: fixedip_cnsl01
@@ -288,7 +288,7 @@ node_templates:
       port:
         extra_dhcp_opts:
           - opt_name: 'domain-name'
-            opt_value: { get_input: location_domain }    
+            opt_value: { get_input: location_domain }
       openstack_config: *open_conf
     relationships:
       - type: cloudify.relationships.contained_in
@@ -331,7 +331,8 @@ node_templates:
               ip_addresses:
                 - { get_attribute: [ floatingip_cnsl00, floating_ip_address ] }
                 - { get_attribute: [ floatingip_cnsl01, floating_ip_address ] }
-                - { get_attribute: [ floatingip_cnsl02, floating_ip_address ] }              
+                - { get_attribute: [ floatingip_cnsl02, floating_ip_address ] }
+
     relationships:
       - type: cloudify.relationships.depends_on
         target: floatingip_cnsl00
@@ -353,18 +354,18 @@ node_templates:
           inputs:
             args:
               name: { concat: [ { get_input: location_prefix }, 'cnsl02' ] }
-              userdata:                
+              userdata:
                 concat:
                   - { get_input: vm_init_cnsl_00 }
                   - { get_input: datacenter }
                   - |+
-                  
-                  - { get_input: vm_init_cnsl_01 } 
+
+                  - { get_input: vm_init_cnsl_01 }
     relationships:
       - type: cloudify.openstack.server_connected_to_port
         target: fixedip_cnsl02
       - type: cloudify.openstack.server_connected_to_security_group
-        target: security_group   
+        target: security_group
       - type: cloudify.openstack.server_connected_to_floating_ip
         target: floatingip_cnsl02
       - type: cloudify.openstack.server_connected_to_keypair
diff --git a/platform_base_installation/install.md b/platform_base_installation/install.md
index 036101e..278afb0 100644
--- a/platform_base_installation/install.md
+++ b/platform_base_installation/install.md
@@ -2,7 +2,7 @@
 
 ### Setting up for installation
 #### Installation machine
-This installation process is a _bootstrap process_, not a conventional software installation.  In a conventional installation, the installer spins up a VM and then runs a software installation on it.  That is *_not_* how this installation process works.  This installation targets an OpenStack tenant that is essentially empty. The installation process will create the VMs that it needs in the OpenStack tenant.  The installation process is launched from a machine *_that is not in the OpenStack tenant where the controller is being installed_*.  
+This installation process is a _bootstrap process_, not a conventional software installation.  In a conventional installation, the installer spins up a VM and then runs a software installation on it.  That is *_not_* how this installation process works.  This installation targets an OpenStack tenant that is essentially empty. The installation process will create the VMs that it needs in the OpenStack tenant.  The installation process is launched from a machine *_that is not in the OpenStack tenant where the controller is being installed_*.
 
 The installation machine--which, again, *_must not be in the tenant where the controller is being installed_* must have:
   - CentOS 7 operating system.  (CentOS 6 can be made to work also.)
@@ -14,16 +14,16 @@ The installation machine--which, again, *_must not be in the tenant where the co
   - Connectivity to the repository holding deployment artifacts.
   - Connectivity to the Internet.
   - And, obviously, connectivity to the OpenStack tenant where the controller is being installed.
-  
-#### Tenant setup 
+
+#### Tenant setup
 Certain things need to be set up in the tenant in order to allow the installation to proceed. An `inputs.yaml` containing information about the
 tenant must be created for use in the installation step.
 TODO: Provide more details here.
 
 #### Installing Cloudify Manager and Consul
-Once the tenant is set up and the `inputs.yaml` file is available, Cloudify Manager and the Consul cluster can be 
+Once the tenant is set up and the `inputs.yaml` file is available, Cloudify Manager and the Consul cluster can be
 installed.  The `installer` script in this repository automates the installation.
-  
+
 To run the script:
   - Create a new directory on the installation machine
   - Enter the new directory
@@ -33,6 +33,6 @@ To run the script:
     - `/path/to/inputs/file` is the path to the file generated with `configure-dcae`
     - `/path/to/ssh-key` is the path to a local copy of the private key for the keypair set up with `configure-dcae`
     - `location-id` is  the location id (e.g., `solutioning-central`) that will be used to identify the location where this deployment is being performed.  `location-id` sets the Consul datacenter name; it also is used in the Cloudify Manager environment file to mark the section of the file where information about this location is stored.
-  
 
-  
+
+
diff --git a/platform_base_installation/installer b/platform_base_installation/installer
index 600849b..3467170 100755
--- a/platform_base_installation/installer
+++ b/platform_base_installation/installer
@@ -17,7 +17,7 @@
 # limitations under the License.
 # ============LICENSE_END============================================
 #
-# ECOMP and OpenECOMP are trademarks 
+# ECOMP and OpenECOMP are trademarks
 # and service marks of AT&T Intellectual Property.
 #
 
@@ -134,7 +134,7 @@ then
 fi
 
 
-# Copy private key onto Cloudify Manager VM 
+# Copy private key onto Cloudify Manager VM
 PVTKEYPATH=$(cat ${INPUTS} | grep "key_filename" | cut -d "'" -f2)
 PVTKEYNAME=$(basename $PVTKEYPATH)
 PVTKEYDIR=$(dirname $PVTKEYPATH)
@@ -196,7 +196,7 @@ rm -rf $TMPBASE
 scp $SSHOPTS -i $PVTKEY2 $SRCS $SSHUSER@$PUBIP:/tmp/.
 ssh -t $SSHOPTS -i $PVTKEY2 $SSHUSER@$PUBIP 'sudo bash -xc "cd /opt; tar xf /tmp/srcs.tar; chown -R root:root /opt/cloudify /opt/manager; rm -rf /tmp/srcs.tar"'
 #
-#	Install config file -- was done by DCAE controller.  What now?  
+#	Install config file -- was done by DCAE controller.  What now?
 #
 ssh $SSHOPTS -t -i $PVTKEY2 $SSHUSER@$PUBIP 'sudo bash -xc '"'"'mkdir -p /opt/dcae; if [ -f /tmp/cfy-config.txt ]; then cp /tmp/cfy-config.txt /opt/dcae/config.txt && chmod 644 /opt/dcae/config.txt; fi'"'"
 cd $WORKDIR