Skip to content

Commit

Permalink
Additional formatting fixes and cleaning up </div> elements
Browse files Browse the repository at this point in the history
  • Loading branch information
dehawkins512 committed Oct 23, 2020
1 parent 55de652 commit f2c5322
Show file tree
Hide file tree
Showing 73 changed files with 312 additions and 981 deletions.
6 changes: 1 addition & 5 deletions api/overview/json.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,7 @@ resources and collections defined in this API.

**Note:**

<div class="title">

About permissions and security:

</div>
#### About permissions and security:

Advertising of the common actions depends purely on the role and permissions of that the current API user does have for the particular resource.

Expand Down
2 changes: 1 addition & 1 deletion appliance_hardening_guide/_topics/db_ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The procedures in this section use the SSL certificate and the following key fil

The appliance image ships with a default SSL certificate and it is recommended to change this certificate. You can use a certificate that is signed by a trusted CA, or generate a self-signed certificate.

For more information, see the [Generating SSL Certificates section](#generating-ssl-certificates-for-your-appliance-and-database).
For more information, see [Generating SSL Certificates for Your Appliance and Database](#generating-ssl-certificates-for-your-appliance-and-database).


- `/var/www/miq/vmdb/certs/server.cer` - Signed or self-signed certificate for the database appliance.
Expand Down
2 changes: 1 addition & 1 deletion appliance_hardening_guide/_topics/ssl_certs.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ After the certificate and key files have been copied, restart the appliance:

The appliance now uses your own certificate.

If your environment consists of multiple appliances connecting to a single database appliance, you can use your certificate and key files to set up SSL for the database connection. For more information, see [Configuring the Database to use SSL](#_chap_red_hat_cloudforms_security_guide_setting_ssl_for_the_database_appliance).
If your environment consists of multiple appliances connecting to a single database appliance, you can use your certificate and key files to set up SSL for the database connection. For more information, see [Configuring the Database to use SSL](#configuring-the-database-to-use-ssl).

**Important:**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,18 @@

3. Enter the virtual machine description in **VM Description**.

5. In **VM Characteristics**, enter **Number of CPUs** and **VM
Memory**.
5. In **VM Characteristics**, enter **Number of CPUs** and **VM Memory**.

6. Click **Add to Shopping Cart** and access the shopping cart by
clicking its icon on the upper-right corner of the screen.
6. Click **Add to Shopping Cart** and access the shopping cart by clicking its icon on the upper-right corner of the screen.

7. Click **Order**.

You have ordered a new provisioning request. You can follow its progress
and see additional details of the order request by selecting it from the
**Orders** tab.
You have ordered a new provisioning request. You can follow its progress and see additional details of the order request by selecting it from the **Orders** tab.

Also, see the [Self Service User Interface Guide](/self_service_user_interface_guide/_topics/accessing_self_service_ui.md) for more information about using the Self Service user interface.
Also, see the [Self Service User Interface Guide](../self_service_user_interface_guide/index.html) for more information about using the Self Service user interface.

**Summary.**

As part of the above sample service, you created a provisioning dialog
that defines the options that can be set on a virtual machine. Then, you
created a service dialog which allows us to expose certain options to be
set by the user. For our example, the service name, virtual machine
name, virtual machine description, and virtual machine characteristics
are configurable. Additionally, you created a service catalog and
finally a catalog item. The catalog item combines the service dialog
with all of the options in the provisioning dialog. Lastly, you
provisioned a Red Hat Virtualization virtual machine using the Self
Service user interface.
As part of the above sample service, you created a provisioning dialog that defines the options that can be set on a virtual machine. Then, you created a service dialog which allows us to expose certain options to be
set by the user. For our example, the service name, virtual machine name, virtual machine description, and virtual machine characteristics are configurable. Additionally, you created a service catalog and
finally a catalog item. The catalog item combines the service dialog with all of the options in the provisioning dialog. Lastly, you provisioned a Red Hat Virtualization virtual machine using the Self Service user interface.
2 changes: 1 addition & 1 deletion creating_a_service_for_vm_provisioning/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
---

# Creating a Service in CloudForms for Virtual Machine Provisioning
# Creating a Service in {{ site.data.product.product.title_short }} for Virtual Machine Provisioning

{% include_relative _topics/overview.md %}

Expand Down
3 changes: 1 addition & 2 deletions general_configuration/_topics/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -2159,8 +2159,7 @@ When you create a group, you must specify a role to give the group
rights to resources in the console. The group’s role determines the
scope of access for the users that are members of the group.

![cloudforms general config roles 460469 1017
jcs](../images/cloudforms_general_config_roles_460469_1017_jcs.png)
![general config roles jcs](../images/general_config_roles_jcs.png)

{{ site.data.product.title }} provides a default group of roles, but you can also
create your own, or copy and edit the default groups.
Expand Down
22 changes: 6 additions & 16 deletions high_availability_guide/_topics/ha_roles.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
## Scaling a Highly Available {{ site.data.product.title_short }} Environment

After creating high availability for the database tier and the user
interface tier, the rest of the infrastructure should be sized
appropriately for the roles and the environments that they manage. These
roles and tiers use built-in high availability mechanisms like primary,
secondary, and tertiary failover.
After creating high availability for the database tier and the user interface tier, the rest of the infrastructure should be sized appropriately for the roles and the environments that they manage. These
roles and tiers use built-in high availability mechanisms like primary, secondary, and tertiary failover.

You can configure additional worker appliances as needed using the steps
in [Installing Additional Appliances](#installing-additional-manageiq-appliances), and then assign zones and
server roles. The non-database {{ site.data.product.title_short }} appliances and
You can configure additional worker appliances as needed using the steps in [Installing Additional Appliances](#installing-additional-manageiq-appliances), and then assign zones and server roles. The non-database {{ site.data.product.title_short }} appliances and
roles can be configured in any order.

The following diagram shows an example of a highly available database
configuration that contains worker appliances, providers, and the
HAProxy load balancer configured in [Configuring the HAProxy Load Balancer](#configuring-the-haproxy-load-balancer).
The following diagram shows an example of a highly available database configuration that contains worker appliances, providers, and the HAProxy load balancer configured in [Configuring the HAProxy Load Balancer](#configuring-the-haproxy-load-balancer).

The worker appliances in the diagram are labeled by server role (**User
Interface**, **Management**, and **Database Ops**) and corresponding
zone to show how a highly available environment might be scaled with
The worker appliances in the diagram are labeled by server role (**User Interface**, **Management**, and **Database Ops**) and corresponding zone to show how a highly available environment might be scaled with
server roles and zones.

![cloudforms ha architecture 431939 0917 ece
02](../images/cloudforms_ha_architecture_431939_0917_ece-02.png)
![ha architecture 431939 0917 ece 02](../images/ha_architecture_431939_0917_ece-02.png)

See [Regions](../general_configuration/index.html#regions)
and [Servers](../general_configuration/index.html#servers)
Expand Down
6 changes: 2 additions & 4 deletions high_availability_guide/_topics/haproxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ HAProxy policy.
**Note:**

Additional configuration is required to run HAProxy on Red Hat OpenStack
Platform. See the [OpenStack Networking
Guide](https://access.redhat.com/documentation/en/red-hat-openstack-platform/10/single/networking-guide/)
Platform. See the [OpenStack Networking Guide](https://access.redhat.com/documentation/en/red-hat-openstack-platform/10/single/networking-guide/)
for more information.

This configuration uses two HAProxy servers and a virtual IP (configured by `keepalived`). The following example procedure uses the following IP addresses and names; substitute values for your environment as needed:
Expand All @@ -48,8 +47,7 @@ This configuration uses two HAProxy servers and a virtual IP (configured by `kee
(cfme2.example.com)

The following diagram shows the HAProxy configuration in this procedure:
![cloudforms ha architecture 431939 0917 ece
01](../images/cloudforms_ha_architecture_431939_0917_ece-01.png)
![ha architecture 431939 0917 ece 01](../images/ha_architecture_431939_0917_ece-01.png)

To configure HAProxy load balancing:

Expand Down
6 changes: 2 additions & 4 deletions high_availability_guide/_topics/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@ the non-database {{ site.data.product.title_short }} appliances.
will not run. This is required in highly available database
deployments.

<div class="warning">

**Warning:**
This configuration is not reversible.

</div>

7. Create the database password.

**Note:**
Expand Down
File renamed without changes
Loading

0 comments on commit f2c5322

Please sign in to comment.