Change-Id: I437f3bfa377bb1fdce271b61dc41b5b339a8b7d5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6610
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Stuart Clements <sclements@vmware.com>
| ... | ... |
@@ -90,6 +90,6 @@ You can view the cloud-init output log file on EC2 at `/var/log/cloud-init-outpu |
| 90 | 90 |
|
| 91 | 91 |
For more information on using cloud-init user data on EC2, see [Running Commands on Your Linux Instance at Launch](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html). |
| 92 | 92 |
|
| 93 |
-For more information on how to get Photon OS up and running on EC2 and run a containerized application in the Docker engine, see [Running Photon OS on Amazon Elastic Cloud Compute](Running-Photon-OS-on-Amazon-Elastic-Cloud-Compute.md). |
|
| 93 |
+For more information on how to get Photon OS up and running on EC2 and run a containerized application in the Docker engine, see [Running Photon OS on Amazon Elastic Cloud Compute](../photon_installation/Running-Photon-OS-on-Amazon-Elastic-Cloud-Compute.md). |
|
| 94 | 94 |
|
| 95 |
-With Photon OS, you can also build cloud images on Google Compute Engine and other cloud providers. For more information, see [Compatible Cloud Images](cloud-images.md). |
|
| 96 | 95 |
\ No newline at end of file |
| 96 |
+With Photon OS, you can also build cloud images on Google Compute Engine and other cloud providers. For more information, see [Compatible Cloud Images](../photon_installation/cloud-images.md). |
|
| 97 | 97 |
\ No newline at end of file |
| ... | ... |
@@ -4,4 +4,4 @@ This section describes the security policy of Photon OS. |
| 4 | 4 |
|
| 5 | 5 |
- [Default Firewall Settings](default-firewall-settings.md) |
| 6 | 6 |
- [Default Permissions and umask](default-permissions-and-umask.md) |
| 7 |
-- [Disabling TLS 1.0 to Improve Transport Layer Security](disabling-tls.md) |
|
| 8 | 7 |
\ No newline at end of file |
| 8 |
+- [Disabling TLS 1.0 to Improve Transport Layer Security](disabling-tls-1.0.md) |
|
| 9 | 9 |
\ No newline at end of file |
| ... | ... |
@@ -14,7 +14,7 @@ When a cloud instance of Photon OS starts, `cloud-init` requires a data source. |
| 14 | 14 |
|
| 15 | 15 |
The metadata gives the cloud service provider instructions on how to implement the Photon OS machine in the cloud infrastructure. Metadata typically includes the instance ID and the local host name. |
| 16 | 16 |
|
| 17 |
-The user data contains the commands and scripts that Photon OS executes when it starts in the cloud. The user data commonly takes the form of a shell script or a YAML file containing a cloud configuration. The [cloud-init documentation](https://launchpad.net/cloud-init and https://cloudinit.readthedocs.org/en/latest/) contains information about the types of data sources and the formats for metadata and user data. |
|
| 17 |
+The user data contains the commands and scripts that Photon OS executes when it starts in the cloud. The user data commonly takes the form of a shell script or a YAML file containing a cloud configuration. The [cloud-init overview](https://launchpad.net/cloud-init) and [cloud-init documentation](https://cloudinit.readthedocs.org/en/latest/) contains information about the types of data sources and the formats for metadata and user data. |
|
| 18 | 18 |
|
| 19 | 19 |
On Photon OS, `cloud-init` is enabled and running by default. You can use the following command to check the status: |
| 20 | 20 |
|
| ... | ... |
@@ -23,4 +23,4 @@ To add support for Java programs to the minimal version of Photon OS, install th |
| 23 | 23 |
|
| 24 | 24 |
**NOTE:** `openjdk` and `openjre` are available as openjdk8 and openjre8 in Photon OS 3.0 |
| 25 | 25 |
|
| 26 |
-For more information about `tdnf`, see [Tiny DNF for Package Management](tiny-dnf-for-package-management.md) |
|
| 26 |
+For more information about `tdnf`, see [Tiny DNF for Package Management](tdnf.md) |
| ... | ... |
@@ -3,4 +3,4 @@ |
| 3 | 3 |
|
| 4 | 4 |
The Kubernetes package provides several services: kube-apiserver, kube-scheduler, kube-controller-manager, kubelet, kube-proxy. These services are managed by `systemd`. Their configuration resides in a central location: `/etc/kubernetes`. |
| 5 | 5 |
|
| 6 |
-For more information, see [Running Kubernetes on Photon OS](photon_user/running_kubernetes.md). |
|
| 6 |
+For more information, see [Running Kubernetes on Photon OS](../photon_user/running_kubernetes.md). |
| ... | ... |
@@ -8,4 +8,4 @@ The `nfs-utils` package is installed by default in the full version of Photon OS |
| 8 | 8 |
tdnf install nfs-utils |
| 9 | 9 |
``` |
| 10 | 10 |
|
| 11 |
-For instructions on how to use `nfs-utils` to share files over a network, see [Photon OS nfs-utils](nfs-utils.md). |
|
| 12 | 11 |
\ No newline at end of file |
| 12 |
+For instructions on how to use `nfs-utils` to share files over a network, see [Photon OS nfs-utils](../photon_user/nfs-utils.md). |
|
| 13 | 13 |
\ No newline at end of file |
| ... | ... |
@@ -9,5 +9,5 @@ Photon OS manages packages with an open source, yum-compatible package manager c |
| 9 | 9 |
- [Configure a Repository](configure-a-repository.md) |
| 10 | 10 |
- [Adding the Dev Repository to Get New Packages from the GitHub Dev Branch](adding-the-dev-repository.md) |
| 11 | 11 |
- [Standard Syntax for `tdnf` Commands](standard_tdnf_syntax.md) |
| 12 |
- - [Options for Commands](photon_admin/options-for-commands.md) |
|
| 13 |
- - [Commands](photon_admin/commands.md) |
|
| 14 | 12 |
\ No newline at end of file |
| 13 |
+ - [Options for Commands](options-for-commands.md) |
|
| 14 |
+ - [Commands](commands.md) |
|
| 15 | 15 |
\ No newline at end of file |
| ... | ... |
@@ -13,6 +13,6 @@ The Network Configuration Manager library that ships with Photon OS 3.0 provides |
| 13 | 13 |
|
| 14 | 14 |
For more information, see: |
| 15 | 15 |
|
| 16 |
-- **CLI** - see the ``-net`` commands in the [Photon Management Daemon Command-line Interface (pmd-cli)](photon_cli/pmd-cli.md) |
|
| 16 |
+- **CLI** - see the ``-net`` commands in the [Photon Management Daemon Command-line Interface (pmd-cli)](../photon_cli/pmd-cli.md) |
|
| 17 | 17 |
- **C APIs** - [Network Configuration Manager - C API](netmgr.c.md) |
| 18 | 18 |
- **Python APIs** - [Network Configuration Manager - Python API](netmgr.python.md) |
| 19 | 19 |
\ No newline at end of file |
| ... | ... |
@@ -7,5 +7,5 @@ You can use Photon OS as a virtual machine within VMware Workstation. You can do |
| 7 | 7 |
- [Importing the OVA for Photon OS 3.0](importing_ova_for_photon_os_3.0-workstation.md) |
| 8 | 8 |
- [Installing the ISO Image for Photon OS 3.0](installing-the-iso-image-for-photon-os-30-workstation.md) |
| 9 | 9 |
|
| 10 |
-**Note**: If you want to upgrade an existing Photon 1.0 VM, refer to the instructions in [Upgrading to Photon OS 3.0](Upgrading-to-Photon-OS-3.0.md). |
|
| 10 |
+**Note**: If you want to upgrade an existing Photon 1.0 VM, refer to the instructions in [Upgrading to Photon OS 3.0](Upgrading_to_photon_os_3.0.md). |
|
| 11 | 11 |
|
| ... | ... |
@@ -6,6 +6,6 @@ You can use Photon OS as a virtual machine within VMware vSphere. You can downlo |
| 6 | 6 |
- [Importing the OVA for Photon OS 3.0](importing_ova_for_photon_os_3.0.md) |
| 7 | 7 |
- [Installing the ISO Image for Photon OS 3.0](installing-the-iso-image-for-photon-os-30.md) |
| 8 | 8 |
|
| 9 |
-**Note**: If you want to upgrade an existing Photon 1.0 VM, see [Upgrading to Photon OS 3.0](Upgrading-to-Photon-OS-3.0.md). |
|
| 9 |
+**Note**: If you want to upgrade an existing Photon 1.0 VM, see [Upgrading to Photon OS 3.0](Upgrading_to_photon_os_3.0.md). |
|
| 10 | 10 |
|
| 11 | 11 |
|
| ... | ... |
@@ -3,8 +3,8 @@ |
| 3 | 3 |
You can use Photon OS as a virtual machine within VMware Fusion. You can download Photon OS, as an OVA or ISO file, and install the Photon OS distribution on Fusion. After you install Photon OS, you can deploy a containerized application in Docker with a single command. |
| 4 | 4 |
|
| 5 | 5 |
- [Prerequisites](photon_os_fusion_prerequisites.md) |
| 6 |
-- [Importing the OVA for Photon OS 3.0](importing-the-ova-for-photon-os-3.0-fusion.md) |
|
| 6 |
+- [Importing the OVA for Photon OS 3.0](importing-ova-for-photon-os-3.0-fusion.md) |
|
| 7 | 7 |
- [Installing the ISO Image for Photon OS 3.0](installing-the-iso-image-for-photon-os-30-fusion.md) |
| 8 | 8 |
|
| 9 |
-**Note**: If you want to upgrade an existing Photon 1.0 VM, see [Upgrading to Photon OS 3.0](Upgrading-to-Photon-OS-3.0.md). |
|
| 9 |
+**Note**: If you want to upgrade an existing Photon 1.0 VM, see [Upgrading to Photon OS 3.0](Upgrading_to_photon_os_3.0.md). |
|
| 10 | 10 |
|
| ... | ... |
@@ -36,7 +36,7 @@ To show help text for individual interfaces: |
| 36 | 36 |
>>> help(pmd.server().firewall) |
| 37 | 37 |
>>> help(pmd.server().user) |
| 38 | 38 |
~~~~ |
| 39 |
-For details about the network commands, see also the [Network Configuration Manager - Python API](photon_admin/netmgr.python.md). |
|
| 39 |
+For details about the network commands, see also the [Network Configuration Manager - Python API](../photon_admin/netmgr.python.md). |
|
| 40 | 40 |
|
| 41 | 41 |
## PMD C API |
| 42 | 42 |
|
| ... | ... |
@@ -44,4 +44,4 @@ PMD C APIs are defined in the header files (pmd_fwmgmt.h, pmd_netmgr.h, pmd_pkgm |
| 44 | 44 |
~~~~ |
| 45 | 45 |
[https://github.com/vmware/pmd/tree/master/include](https://github.com/vmware/pmd/tree/master/include) |
| 46 | 46 |
~~~~ |
| 47 |
-For details about the network commands, see also the [Network Configuration Manager - C API](photon_admin/netmgr.c.md). |
|
| 48 | 47 |
\ No newline at end of file |
| 48 |
+For details about the network commands, see also the [Network Configuration Manager - C API](../photon_admin/netmgr.c.md). |
|
| 49 | 49 |
\ No newline at end of file |
| ... | ... |
@@ -9,5 +9,5 @@ You can build an ISO from the source code for Photon OS. This section describes |
| 9 | 9 |
* [Use Cached Sources](use_cached_sources.md) |
| 10 | 10 |
* [View Build Logs](view_build_logs.md) |
| 11 | 11 |
|
| 12 |
-For information on how to install and build a package on Photon OS from the package's source RPM, see the [Photon OS Administration Guide](photon_admin/building-a-package-from-a-source-rpm.md). |
|
| 12 |
+For information on how to install and build a package on Photon OS from the package's source RPM, see the [Photon OS Administration Guide](../photon_admin/building-a-package-from-a-source-rpm.md). |
|
| 13 | 13 |
|
| ... | ... |
@@ -3,8 +3,11 @@ |
| 3 | 3 |
Before you build the ISO, verify that you have the performed the following tasks: |
| 4 | 4 |
|
| 5 | 5 |
* Installed a build operating system running the 64-bit version of Ubuntu 14.04 or later version. |
| 6 |
+ |
|
| 6 | 7 |
* Downloaded and installed the following packages: `bison`, `gawk`, `g++`, `createrepo`, `python-aptdaemon`, `genisoimage`, `texinfo`, `python-requests`, `libfuse-dev, libssl-dev, uuid-dev, libreadline-dev, kpartx, git, bc` |
| 8 |
+ |
|
| 7 | 9 |
* Installed Docker |
| 10 |
+ |
|
| 8 | 11 |
* Downloaded the source code from the Photon OS repository on GitHub into `$HOME/workspaces/photon`. |
| 9 | 12 |
|
| 10 | 13 |
|
| ... | ... |
@@ -69,4 +69,4 @@ After you have downloaded the Photon OS OVA image (OVA with Hardware Version 11) |
| 69 | 69 |
|
| 70 | 70 |
 |
| 71 | 71 |
|
| 72 |
-Once complete, proceed to [Deploying a Containerized Application in Photon OS](deploying-a-containerized-application-in-photon-os-fusion.md). |
|
| 73 | 72 |
\ No newline at end of file |
| 73 |
+Once complete, proceed to [Deploying a Containerized Application in Photon OS](deploying-a-containerized-application-in-photon-os.md). |
|
| 74 | 74 |
\ No newline at end of file |
| ... | ... |
@@ -57,4 +57,4 @@ echo "########################" |
| 57 | 57 |
exit ${exit_code}
|
| 58 | 58 |
```` |
| 59 | 59 |
|
| 60 |
-You can now proceed to [Deploying a Containerized Application in Photon OS](deploying-a-containerized-application-in-photon-os-fusion.md). |
|
| 61 | 60 |
\ No newline at end of file |
| 61 |
+You can now proceed to [Deploying a Containerized Application in Photon OS](deploying-a-containerized-application-in-photon-os.md). |
|
| 62 | 62 |
\ No newline at end of file |
| ... | ... |
@@ -83,7 +83,7 @@ Use the `find` command to troubleshoot a Photon OS machine that has stopped work |
| 83 | 83 |
|
| 84 | 84 |
find / -mtime -1 |
| 85 | 85 |
|
| 86 |
-See the `find` [manual](See https://www.gnu.org/software/findutils/manual/find.html). Take note of the security considerations listed in the `find` manual if you are using `find` to troubleshoot an appliance running on Photon OS. |
|
| 86 |
+See the `find` [manual](https://www.gnu.org/software/findutils/manual/find.html). Take note of the security considerations listed in the `find` manual if you are using `find` to troubleshoot an appliance running on Photon OS. |
|
| 87 | 87 |
|
| 88 | 88 |
## locate |
| 89 | 89 |
|
| ... | ... |
@@ -9,4 +9,4 @@ Use the `systemd` suite of commands and not deprecated `init.d` commands or othe |
| 9 | 9 |
- [Checking Firewall Rules](checking-firewall-rules.md) |
| 10 | 10 |
- [Inspect Network Settings with `netmgr`](netmgr.md) |
| 11 | 11 |
|
| 12 |
-For information about tcpdump and netcat, see [Installing the Packages for tcpdump and netcat with tdnf](photon_admin/installing-the-packages-for-tcpdump-and-netcat-with-tdnf.md) |
|
| 12 |
+For information about tcpdump and netcat, see [Installing the Packages for tcpdump and netcat with tdnf](../photon_admin/installing-the-packages-for-tcpdump-and-netcat-with-tdnf.md) |
| ... | ... |
@@ -6,7 +6,7 @@ On Photon OS, `tdnf` is the default package manager. The standard syntax for `td |
| 6 | 6 |
tdnf [options] <command> [<arguments>...] |
| 7 | 7 |
``` |
| 8 | 8 |
|
| 9 |
-The main configuration files reside in `/etc/tdnf/tdnf.conf`. The repositories appear in `/etc/yum.repos.d/` with `.repo` file extensions. For more information, see the [Photon OS Administration Guide](https://github.com/vmware/photon/blob/master/docs/photon-admin-guide.md). |
|
| 9 |
+The main configuration files reside in `/etc/tdnf/tdnf.conf`. The repositories appear in `/etc/yum.repos.d/` with `.repo` file extensions. For more information, see the [Photon OS Administration Guide](../photon_admin/README.md). |
|
| 10 | 10 |
|
| 11 | 11 |
The cache files for data and metadata reside in `/var/cache/tdnf`. The local cache is populated with data from the repository: |
| 12 | 12 |
|
| ... | ... |
@@ -49,7 +49,7 @@ Perform the following steps to configure the kubelet on the node: |
| 49 | 49 |
|
| 50 | 50 |
## Result |
| 51 | 51 |
|
| 52 |
-You should have a functional cluster. You can now launch a test pod. For an introduction to working with Kubernetes, see [Kubernetes 101](http://kubernetes.io/docs/user-guide/walkthrough/). |
|
| 52 |
+You should have a functional cluster. You can now launch a test pod. For an introduction to working with Kubernetes, see [Kubernetes documentation](http://kubernetes.io/docs/home/). |
|
| 53 | 53 |
|
| 54 | 54 |
|
| 55 | 55 |
|