mirror of
https://github.com/rancher/rancher-docs.git
synced 2026-05-14 09:03:37 +00:00
Fix leftovers from merge conflicts
This commit is contained in:
Catherine Luse
@@ -86,11 +86,7 @@ $ sudo ros config set rancher.upgrade.url https://foo.bar.com/os/releases.yml
|
||||
|
||||
Here is a total cloud-config example for using RancherOS in an air gap environment.
|
||||
|
||||
<<<<<<< HEAD:content/os/v1.x/en/installation/configuration/airgap-configuration/_index.md
|
||||
For `system-docker`, see [Configuring Private Docker Registry]({{<baseurl>}}/os/v1.x/en/installation/configuration/airgap-configuration/#configuring-private-docker-registry).
|
||||
=======
|
||||
For `system-docker`, see [Configuring Private Docker Registry]({{< baseurl >}}/os/v1.x/en/configuration/airgap-configuration/#configuring-private-docker-registry).
|
||||
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/configuration/airgap-configuration/_index.md
|
||||
|
||||
```yaml
|
||||
#cloud-config
|
||||
|
||||
@@ -5,15 +5,6 @@ aliases:
|
||||
- /os/v1.x/en/installation/configuration/switching-consoles
|
||||
---
|
||||
|
||||
<<<<<<< HEAD:content/os/v1.x/en/installation/configuration/switching-consoles/_index.md
|
||||
When [booting from the ISO]({{<baseurl>}}/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/), RancherOS starts with the default console, which is based on busybox.
|
||||
|
||||
You can select which console you want RancherOS to start with using the [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config).
|
||||
|
||||
### Enabling Consoles using Cloud-Config
|
||||
|
||||
When launching RancherOS with a [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config) file, you can select which console you want to use.
|
||||
=======
|
||||
When [booting from the ISO]({{< baseurl >}}/os/v1.x/en/installation/workstation//boot-from-iso/), RancherOS starts with the default console, which is based on busybox.
|
||||
|
||||
You can select which console you want RancherOS to start with using the [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config).
|
||||
@@ -21,7 +12,6 @@ You can select which console you want RancherOS to start with using the [cloud-c
|
||||
### Enabling Consoles using Cloud-Config
|
||||
|
||||
When launching RancherOS with a [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config) file, you can select which console you want to use.
|
||||
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/configuration/switching-consoles/_index.md
|
||||
|
||||
Currently, the list of available consoles are:
|
||||
|
||||
|
||||
@@ -5,11 +5,7 @@ aliases:
|
||||
- /os/v1.x/en/installation/configuration/switching-docker-versions
|
||||
---
|
||||
|
||||
<<<<<<< HEAD:content/os/v1.x/en/installation/configuration/switching-docker-versions/_index.md
|
||||
The version of User Docker used in RancherOS can be configured using a [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config) file or by using the `ros engine` command.
|
||||
=======
|
||||
The version of User Docker used in RancherOS can be configured using a [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config) file or by using the `ros engine` command.
|
||||
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/configuration/switching-docker-versions/_index.md
|
||||
|
||||
> **Note:** There are known issues in Docker when switching between versions. For production systems, we recommend setting the Docker engine only once [using a cloud-config](#setting-the-docker-engine-using-cloud-config).
|
||||
|
||||
@@ -89,11 +85,7 @@ FROM scratch
|
||||
COPY engine /engine
|
||||
```
|
||||
|
||||
<<<<<<< HEAD:content/os/v1.x/en/installation/configuration/switching-docker-versions/_index.md
|
||||
Once the image is built a [system service]({{<baseurl>}}/os/v1.x/en/installation/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-18.06.3-ce.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
|
||||
=======
|
||||
Once the image is built a [system service]({{< baseurl >}}/os/v1.x/en/system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-18.06.3-ce.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
|
||||
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/configuration/switching-docker-versions/_index.md
|
||||
|
||||
All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
|
||||
|
||||
|
||||
@@ -30,11 +30,7 @@ Let’s walk through how to import and create a RancherOS on EC2 machine using t
|
||||
{{< img "/img/os/Rancher_aws1.png" "RancherOS on AWS 1">}}
|
||||
2. Select the **Community AMIs** on the sidebar and search for **RancherOS**. Pick the latest version and click **Select**.
|
||||
{{< img "/img/os/Rancher_aws2.png" "RancherOS on AWS 2">}}
|
||||
<<<<<<< HEAD:content/os/v1.x/en/installation/running-rancheros/cloud/aws/_index.md
|
||||
3. Go through the steps of creating the instance type through the AWS console. If you want to pass in a [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config) file during boot of RancherOS, you'd pass in the file as **User data** by expanding the **Advanced Details** in **Step 3: Configure Instance Details**. You can pass in the data as text or as a file.
|
||||
=======
|
||||
3. Go through the steps of creating the instance type through the AWS console. If you want to pass in a [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config) file during boot of RancherOS, you'd pass in the file as **User data** by expanding the **Advanced Details** in **Step 3: Configure Instance Details**. You can pass in the data as text or as a file.
|
||||
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/installation/cloud/aws/_index.md
|
||||
{{< img "/img/os/Rancher_aws6.png" "RancherOS on AWS 6">}}
|
||||
After going through all the steps, you finally click on **Launch**, and either create a new key pair or choose an existing key pair to be used with the EC2 instance. If you have created a new key pair, download the key pair. If you have chosen an existing key pair, make sure you have the key pair accessible. Click on **Launch Instances**.
|
||||
{{< img "/img/os/Rancher_aws3.png" "RancherOS on AWS 3">}}
|
||||
|
||||
@@ -3,15 +3,6 @@ title: Custom Console
|
||||
weight: 180
|
||||
---
|
||||
|
||||
<<<<<<< HEAD
|
||||
When [booting from the ISO]({{<baseurl>}}/os/v1.x/en/installation/running-rancheros/workstation/boot-from-iso/), RancherOS starts with the default console, which is based on busybox.
|
||||
|
||||
You can select which console you want RancherOS to start with using the [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config).
|
||||
|
||||
### Enabling Consoles using Cloud-Config
|
||||
|
||||
When launching RancherOS with a [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config) file, you can select which console you want to use.
|
||||
=======
|
||||
When [booting from the ISO]({{< baseurl >}}/os/v1.x/en/installation/workstation//boot-from-iso/), RancherOS starts with the default console, which is based on busybox.
|
||||
|
||||
You can select which console you want RancherOS to start with using the [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config).
|
||||
@@ -19,7 +10,6 @@ You can select which console you want RancherOS to start with using the [cloud-c
|
||||
### Enabling Consoles using Cloud-Config
|
||||
|
||||
When launching RancherOS with a [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config) file, you can select which console you want to use.
|
||||
>>>>>>> Reorganize RancherOS docs
|
||||
|
||||
Currently, the list of available consoles are:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user