diff --git a/README.rst b/README.rst index 3725a9f..44720b5 100644 --- a/README.rst +++ b/README.rst @@ -1,13 +1,13 @@ -Glazier Manuals +Murano Manuals +++++++++++++++++ This repository contains documentation for the -Glazier project. It includes: +Murano project. It includes: * API Specification * Architecture -For more details, see the `Glazier `_. +For more details, see the `Murano `_. Prerequisites ============= @@ -30,18 +30,18 @@ The different manuals are in subdirectories of the To build a specific guide, look for a ``pom.xml`` file within a subdirectory, then run the ``mvn`` command in that directory. For example:: - cd docs/src/glazier-manual + cd docs/src/murano-manual mvn clean generate-sources The generated PDF documentation file is:: - docs/src/glazier-manual/src/target/docbkx/pdf/glazier-manual.pdf + docs/src/murano-manual/src/target/docbkx/pdf/murano-manual.pdf The root of the generated HTML documentation is:: - docs/src/glazier-manual/src/target/docbkx/webhelp/glazier-manual/content/index.html + docs/src/murano-manual/src/target/docbkx/webhelp/murano-manual/content/index.html Installing ========== -Refer to http://glazier.openstack.org to see where these documents are published -and to learn more about the Glazier project. +Refer to http://murano.openstack.org to see where these documents are published +and to learn more about the Murano project. diff --git a/src/glazier-manual/src/docbkx/figures/architecture_diagram.png b/src/glazier-manual/src/docbkx/figures/architecture_diagram.png deleted file mode 100755 index cf374dd..0000000 Binary files a/src/glazier-manual/src/docbkx/figures/architecture_diagram.png and /dev/null differ diff --git a/src/glazier-manual/pom.xml b/src/murano-manual/pom.xml similarity index 91% rename from src/glazier-manual/pom.xml rename to src/murano-manual/pom.xml index 5bc6ada..e854ff4 100644 --- a/src/glazier-manual/pom.xml +++ b/src/murano-manual/pom.xml @@ -18,11 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.mirantis.glazier + com.mirantis.murano manuals 1.0.0-SNAPSHOT jar - Glazier Project Documentation + Murano Project Documentation @@ -41,7 +41,7 @@ true 100 - + diff --git a/src/glazier-manual/src/docbkx/figures/api_workflow.png b/src/murano-manual/src/docbkx/figures/api_workflow.png similarity index 100% rename from src/glazier-manual/src/docbkx/figures/api_workflow.png rename to src/murano-manual/src/docbkx/figures/api_workflow.png diff --git a/src/murano-manual/src/docbkx/figures/architecture_diagram.png b/src/murano-manual/src/docbkx/figures/architecture_diagram.png new file mode 100755 index 0000000..0160bb0 Binary files /dev/null and b/src/murano-manual/src/docbkx/figures/architecture_diagram.png differ diff --git a/src/glazier-manual/src/docbkx/glazier-manual.xml b/src/murano-manual/src/docbkx/murano-manual.xml similarity index 98% rename from src/glazier-manual/src/docbkx/glazier-manual.xml rename to src/murano-manual/src/docbkx/murano-manual.xml index 042a257..21b40be 100644 --- a/src/glazier-manual/src/docbkx/glazier-manual.xml +++ b/src/murano-manual/src/docbkx/murano-manual.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - Glazier Project Documentation + Murano Project Documentation @@ -39,7 +39,7 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst Mirantis, Inc. v0.1 - Glazier™ + Murano™ 2013-04-04 @@ -64,7 +64,7 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst Overview - Welcome to Glazier Project. + Welcome to Murano Project.
Intended Audience @@ -75,7 +75,7 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst
Document Change History - This version of the Glazier Manual replaces and obsoletes all + This version of the Murano Manual replaces and obsoletes all previous versions. The most recent changes are described in the table below: @@ -115,7 +115,7 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst Architecture -
+
Architecture @@ -128,20 +128,20 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst
- The Glazier architecture has the following components: + The Murano architecture has the following components: - Glazier Dashboard - UI for the Glazier, extends + Murano Dashboard - UI for the Murano, extends Horizon - REST API - exposes Glazier API via REST. Maintains + REST API - exposes Murano API via REST. Maintains environment configurations in Database - Glazier Python Client - Python client for Glazier + Murano Python Client - Python client for Murano REST API @@ -149,12 +149,12 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst Orchestration Engine - builds the environment as configured by the user. Turns environment configurations into a Heat templates - for VM provision and Glazier Agent commands for service + for VM provision and Murano Agent commands for service deployment - Glazier Agent - built into Windows Server VM images. + Murano Agent - built into Windows Server VM images. Executes commands sent by Orchestration Engine @@ -209,9 +209,9 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst
Introduction - Glazier Service API is a programmatic interface used for interaction - with Glazier. Other interaction - mechanisms like Glazier Dashboard or Glazier CLI should use API as underlying + Murano Service API is a programmatic interface used for interaction + with Murano. Other interaction + mechanisms like Murano Dashboard or Murano CLI should use API as underlying protocol for interaction. @@ -292,7 +292,7 @@ http://docbook.org/ns/docbook " xmlns:xsi="http://www.w3.org/2001/XMLSchema-inst
Authentication All requests include a Keystone authentication token header (X-Auth-Token). Clients must authenticate - with Keystone before interacting with the Glazier service. + with Keystone before interacting with the Murano service.