Commit d762e5c2 authored by Francisco-Javier Ramon Salguero's avatar Francisco-Javier Ramon Salguero
Browse files

Merge branch 'master' into 'master' 

Fix broken links

See merge request !42
parents c39b0af0 67469797

01-quickstart.md

+4 −4
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ osm vim-create --name vmware-site --user osm --password osm4u --auth_url https:/ 
    "vcenter_ip": 10.10.10.14}'

```



For advanced options, please refer to the [vCloud Director Setup Guide](11-vcd-configuration.md#add-vcloud-using-osm-client).

For advanced options, please refer to the [Configuring VMware vCloud Director](04-vim-setup.md#vmwares-vcloud-director).



#### VMware Integrated Openstack (VIO) site
@@ -221,7 +221,7 @@ With respect to Openstack, the additional configuration for VIO is the following 
- **dataplane_physical_net**: The configured network_vlan_ranges at neutron for the SRIOV (binding direct) and passthrough (binding direct-physical) networks, e.g. 'physnet_sriov' in the above configuration. In case of VMware Integrated Openstack (VIO) provide moref ID of distributed virtual switch, e.g 'dvs-46' in above configuration.

- **dataplane_net_vlan_range**: In case of VMware Integrated Openstack (VIO) provide vlan ranges for the SRIOV (binding direct) networks in format ['start_ID - end_ID']



For common options, you may refer to the general [OpenStack Setup Guide](05-02-openstack-configuration.md#add-openstack-to-osm).

For common options, you may refer to the general [OpenStack Setup Guide](04-vim-setup.md#openstack).



#### Amazon Web Services (AWS) site
@@ -234,7 +234,7 @@ osm vim-create --name aws-site --user XXX --password YYY --auth_url https://aws. 
    m1.small: {cpus: 1, disk: 160, ram: 1741}}}'

```



For advanced options, please refer to the [AWS Setup Guide](12-aws-configuration.md#add-aws-to-osm).

For advanced options, please refer to the [Configuring AWS for OSM](04-vim-setup.md#amazon-web-services-aws).



#### Microsoft Azure
@@ -257,7 +257,7 @@ For advanced options, please refer to the [Microsoft Azure setup guide](04-vim-s 
osm vim-create --name fos --auth_url <rest proxy ip>:8080 --account_type fos --tenant osm --user dummy --password dummy --config '{hypervisor: LXD}'

```



For advanced options, please refer to the [Eclipse fog05 setup guide](13-fog05-configuration.md#add-eclipse-fog05-to-osm).

For advanced options, please refer to the [Configuring Eclipse fog05 for OSM](04-vim-setup.md#fog05).





### Adding VIMs through GUI