Rename everything for the osad to osa name change
This change updates all fo the names that we were using to the post
openstack migration name for openstack-ansible.
Change-Id: I6524af53ed02e19a0f56908e42a65d2dae8b71e3
(cherry picked from commit 35ec780515
)
This commit is contained in:
parent
ef8fa5bec0
commit
36f2195cdb
|
@ -29,7 +29,7 @@ Importance:
|
|||
Should only be touched if it is a Blocker/Gating issue. If it is, please set to **High**, and only use **Critical** if you have found a bug that can take down whole infrastructures. Once the importance has been changed the status should be changed to *Triaged* by someone other than the bug creator.
|
||||
|
||||
Triaging bugs:
|
||||
Reported bugs need prioritization, confirmation, and shouldn't go stale. If you care about OpenStack stability but aren't wanting to actively develop the roles and playbooks used within the "os-ansible-deployment" project consider contributing in the area of bug triage, which helps immensely. The whole process is described in the upstream `Bug Triage Documentation`_.
|
||||
Reported bugs need prioritization, confirmation, and shouldn't go stale. If you care about OpenStack stability but aren't wanting to actively develop the roles and playbooks used within the "openstack-ansible" project consider contributing in the area of bug triage, which helps immensely. The whole process is described in the upstream `Bug Triage Documentation`_.
|
||||
|
||||
|
||||
Submitting Code
|
||||
|
|
|
@ -8,43 +8,130 @@ OpenStack Ansible Deployment
|
|||
Building a development stack
|
||||
----------------------------
|
||||
|
||||
If you are wanting to build a development stack for testing or otherwise contributing to this repository you can do so using the
|
||||
``gate-check-commit.sh`` script in the scripts directory. To execute this script please do so from the ``os-ansible-deployment`` directory that was created when you cloned the repository.
|
||||
To deploy an *all-in-one* (AIO) environment for testing or contributing to
|
||||
this project, use the scripts in the ``scripts`` directory. You must run these
|
||||
scripts from the repository top-level directory. For example:
|
||||
|
||||
Example AIO build process:
|
||||
.. code-block:: console
|
||||
|
||||
.. code-block:: bash
|
||||
$ git clone https://github.com/openstack/openstack-ansible \
|
||||
/opt/openstack-ansible
|
||||
$ cd /opt/openstack-ansible
|
||||
$ scripts/bootstrap-aio.sh
|
||||
|
||||
# Clone the source code
|
||||
git clone https://github.com/stackforge/os-ansible-deployment /opt/os-ansible-deployment
|
||||
Requirements
|
||||
^^^^^^^^^^^^
|
||||
|
||||
# Change your directory
|
||||
cd /opt/os-ansible-deployment
|
||||
* Quad-core processor capable of running KVM
|
||||
* 8 GB of RAM
|
||||
* 60 GB of storage
|
||||
|
||||
# Checkout your desired branch.
|
||||
git checkout master
|
||||
.. note::
|
||||
|
||||
# Run the script from the root directory of the cloned repository.
|
||||
./scripts/gate-check-commit.sh
|
||||
By default, the deployment scripts use the file system on "/" for
|
||||
containers. Optionally, the deployment scripts can use LVM for
|
||||
containers. To use LVM, create the ``lvm`` volume group. Each
|
||||
container uses a logical volume that requires **5 GB** of available
|
||||
storage in the volume group.
|
||||
|
||||
Alternatively, you can curl/wget the ``run-aio-build.sh`` script:
|
||||
If deploying on a Rackspace public cloud server, use the *general1-8* or
|
||||
larger flavor. Optionally, you can use the Orchestration template
|
||||
``osa-aio-heat-template.yml`` to launch a cloud server and deploy an AIO
|
||||
environment on it.
|
||||
|
||||
.. code-block:: bash
|
||||
These requirements may seem excessive; however, the default AIO deployment
|
||||
builds a roughly 35-node environment that closely matches the reference
|
||||
architecture. For example, components such as RabbitMQ, MariaDB with Galera,
|
||||
source repository, and Identity service all use multiple containers to
|
||||
simulate clustering.
|
||||
|
||||
bash <(curl -s http://git.openstack.org/cgit/stackforge/os-ansible-deployment/plain/scripts/run-aio-build.sh)
|
||||
Finally, the AIO deployment uses HAProxy for testing purposes only. Please
|
||||
do not use this HAProxy configuration for production purposes because it
|
||||
does not provide any redundancy.
|
||||
|
||||
.. note::
|
||||
|
||||
To use these scripts successfully please make sure that you have the following:
|
||||
* At least **60GB** of available storage on "/" when using local file system containers. Containers are built into ``/var/lib/lxc`` and will consume up-to 40GB on their own.
|
||||
* If you would like to test building containers using LVM simply create an **lxc** volume group before executing the script. Be aware that each container will be built with a minimum of 5GB of storage.
|
||||
* 2.4GHZ quad-core processor with that is KVM capable is required.
|
||||
* You must have at least 4GB of available ram.
|
||||
Never deploy an AIO environment on a host that you cannot risk breaking
|
||||
or destroying.
|
||||
|
||||
This may seem like you need a lot to run the stack, which is partially true, however consider that this simple "All in One" deployment builds a "35" node infrastructure and mimics our reference architecture. Additionally, components like Rabbitmq, MariaDB with Galera, Repository servers, and Keystone will all be clustered. Lastly the "All in One" deployment uses HAProxy for test purposes only. **At this time we do not recommend running HAProxy in production**. At this time you should **NEVER** use the AIO script on a box that you care about. Cloud servers such as Rackspace Cloud server of the flavor *general1-8* variety work really well as development machines, as does Virtual Box of KVM instances.
|
||||
Procedure
|
||||
^^^^^^^^^
|
||||
|
||||
Using Heat:
|
||||
If you would like to use heat to deploy an All in one node there is a heat script which you can use. Simply get and or source the raw script as found here: "https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/scripts/osad-aio-heat-template.yml"
|
||||
To deploy an AIO environment, complete these steps:
|
||||
|
||||
#. Clone the repository:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ git clone https://github.com/openstack/openstack-ansible \
|
||||
/opt/openstack-ansible
|
||||
|
||||
#. Change to the repository top-level directory:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ cd /opt/openstack-ansible
|
||||
|
||||
#. By default, the repository uses the *master* branch. Optionally, you can
|
||||
check out a different branch. For example, to check out the Kilo branch:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ git checkout kilo
|
||||
|
||||
#. By default, the scripts deploy all OpenStack services. Optionally, you can
|
||||
disable one or more services using environment variables. See the
|
||||
``DEPLOY_*`` variables in the ``run-playbooks.sh`` script for details. For
|
||||
example, to disable the Telemetry service:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ export DEPLOY_CEILOMETER="no"
|
||||
|
||||
.. note::
|
||||
|
||||
The scripts still build containers for any service that you disable, but
|
||||
do not deploy the service.
|
||||
|
||||
#. Prepare the host:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ scripts/bootstrap-aio.sh
|
||||
|
||||
.. note::
|
||||
|
||||
This script configures the host operating system and supplies values for
|
||||
mandatory options in configuration files in the
|
||||
``/etc/openstack_deploy`` directory.
|
||||
|
||||
#. Install the necessary Ansible components:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ scripts/bootstrap-ansible.sh
|
||||
|
||||
.. note::
|
||||
|
||||
Only run this script once.
|
||||
|
||||
#. Run the Ansible playbooks to deploy the environment:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ scripts/run-playbooks.sh
|
||||
|
||||
.. note::
|
||||
|
||||
You can run this script multiple times.
|
||||
|
||||
Optionally, you can run individual playbooks. For example, to deploy the
|
||||
Identity service:
|
||||
|
||||
.. code-block:: console
|
||||
|
||||
$ cd /opt/openstack-ansible/playbooks
|
||||
$ openstack-ansible os-keystone-install.yml
|
||||
|
||||
Rebuilding the stack
|
||||
^^^^^^^^^^^^^^^^^^^^
|
||||
|
@ -56,7 +143,7 @@ Example:
|
|||
.. code-block:: bash
|
||||
|
||||
# Move to the playbooks directory.
|
||||
cd /opt/os-ansible-deployment/playbooks
|
||||
cd /opt/openstack-ansible/playbooks
|
||||
|
||||
# Destroy all of the running containers.
|
||||
openstack-ansible lxc-containers-destroy.yml
|
||||
|
@ -74,6 +161,7 @@ Example:
|
|||
Using the teardown script:
|
||||
The ``teardown.sh`` script that will destroy everything known within an environment. You should be aware that this script will destroy whole environments and should be used **WITH CAUTION**.
|
||||
|
||||
This script will destroy all of your running containers and remove items within the ``/openstack`` directory for the container. After the completion of this play you can rerun the ``run-playbooks.sh`` or you can run the plays manually to rebuild the stack.
|
||||
|
||||
Notice
|
||||
^^^^^^
|
||||
|
@ -85,9 +173,6 @@ The system uses a number of variables. You should look a the scripts for a full
|
|||
export PUBLIC_INTERFACE="<<REPLACE WITH THE NAME OF THE INTERFACE>>" # This is only required if you dont have eth0
|
||||
|
||||
|
||||
This play will destroy all of your running containers and remove items within the ``/openstack`` directory for the container. After the completion of this play you can rerun the ``cloudserver-aio.sh`` or you can run the plays manually to rebuild the stack.
|
||||
|
||||
|
||||
Diagram of stack
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
|
@ -103,47 +188,49 @@ Diagram::
|
|||
V [ * ] Socket Connections
|
||||
[ HOST MACHINE ] [ <>v^ ] Network Connections
|
||||
* ^ *
|
||||
| | |-----------------------------------------------------
|
||||
| | |
|
||||
| |---------------->[ HAProxy ] |
|
||||
| ^ |
|
||||
| | |
|
||||
| V |
|
||||
| (BR-Interfaces)<----- |
|
||||
| ^ * | |
|
||||
*-[ LXC ]*--*--------------------|-----|------|----| |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | V * | |
|
||||
| * | | [ Galera x3 ] |
|
||||
| [ Memcached ]<----------| | | |
|
||||
*-------*[ Rsyslog ]<------------|--| | * |
|
||||
| [ Repos Server x3 ]<----| ---|-->[ RabbitMQ x3 ] |
|
||||
| [ Horizon ]<------------| | | |
|
||||
| [ Nova api ec2 ]<-------|--| | |
|
||||
| [ Nova api os ]<--------|->| | |
|
||||
| [ Nova spice console ]<-| | | |
|
||||
| [ Nova Cert ]<----------|->| | |
|
||||
| [ Cinder api ]<---------|->| | |
|
||||
| [ Glance api ]<---------|->| | |
|
||||
| [ Heat apis ]<----------|->| | [ Loop back devices ]*-*
|
||||
| [ Heat engine ]<--------|->| | \ \ |
|
||||
| ------>[ Nova api metadata ] | | | { LVM } { XFS x3 } |
|
||||
| | [ Nova conductor ]<-----| | | * * |
|
||||
| |----->[ Nova scheduler ]------|->| | | | |
|
||||
| | [ Keystone x3 ]<--------|->| | | | |
|
||||
| | |--->[ Neutron agents ]*-----|--|---------------------------*
|
||||
| | | [ Neutron server ]<-----|->| | | |
|
||||
| | | |->[ Swift proxy ]<--------- | | | |
|
||||
*-|-|-|-*[ Cinder volume ]*--------------------* | |
|
||||
| | | | | | |
|
||||
| | | --------------------------------------- | |
|
||||
| | --------------------------------------- | | |
|
||||
| | -----------------------| | | | |
|
||||
| | | | | | |
|
||||
| | V | | * |
|
||||
---->[ Compute ]*[ Neutron linuxbridge ]<-| |->[ Swift storage ]-
|
||||
| | |-------------------------------------------------------
|
||||
| | |
|
||||
| |---------------->[ HAProxy ] |
|
||||
| ^ |
|
||||
| | |
|
||||
| V |
|
||||
| (BR-Interfaces)<------- |
|
||||
| ^ * | |
|
||||
*-[ LXC ]*--*----------------------|-----|------|----| |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | V * | |
|
||||
| * | | [ Galera x3 ] |
|
||||
| [ Memcached ]<------------| | | |
|
||||
*-------*[ Rsyslog ]<--------------|--| | * |
|
||||
| [ Repos Server x3 ]<------| ---|-->[ RabbitMQ x3 ] |
|
||||
| [ Horizon x2 ]<-----------| | | |
|
||||
| [ Nova api ec2 ]<---------|--| | |
|
||||
| [ Nova api os ]<----------|->| | |
|
||||
| [ Nova console ]<---------| | | |
|
||||
| [ Nova Cert ]<------------|->| | |
|
||||
| [ Ceilometer api ]<-------|->| | |
|
||||
| [ Ceilometer collector ]<-|->| | |
|
||||
| [ Cinder api ]<-----------|->| | |
|
||||
| [ Glance api ]<-----------|->| | |
|
||||
| [ Heat apis ]<------------|->| | [ Loop back devices ]*-*
|
||||
| [ Heat engine ]<----------|->| | \ \ |
|
||||
| ------>[ Nova api metadata ] | | | { LVM } { XFS x3 } |
|
||||
| | [ Nova conductor ]<-------| | | * * |
|
||||
| |----->[ Nova scheduler ]--------|->| | | | |
|
||||
| | [ Keystone x3 ]<----------|->| | | | |
|
||||
| | |--->[ Neutron agents ]*-------|--|---------------------------*
|
||||
| | | [ Neutron server ]<-------|->| | | |
|
||||
| | | |->[ Swift proxy ]<----------- | | | |
|
||||
*-|-|-|-*[ Cinder volume ]*----------------------* | |
|
||||
| | | | | | |
|
||||
| | | ----------------------------------------- | |
|
||||
| | ----------------------------------------- | | |
|
||||
| | -------------------------| | | | |
|
||||
| | | | | | |
|
||||
| | V | | * |
|
||||
---->[ Compute ]*[ Neutron linuxbridge ]<---| |->[ Swift storage ]-
|
||||
|
||||
|
||||
====== ASCII Diagram for AIO infrastructure ======
|
||||
|
|
|
@ -87,9 +87,9 @@ qthelp:
|
|||
@echo
|
||||
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
|
||||
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
|
||||
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/os-ansible-deployment.qhcp"
|
||||
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/openstack-ansible.qhcp"
|
||||
@echo "To view the help file:"
|
||||
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/os-ansible-deployment.qhc"
|
||||
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openstack-ansible.qhc"
|
||||
|
||||
applehelp:
|
||||
$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
|
||||
|
@ -104,8 +104,8 @@ devhelp:
|
|||
@echo
|
||||
@echo "Build finished."
|
||||
@echo "To view the help file:"
|
||||
@echo "# mkdir -p $$HOME/.local/share/devhelp/os-ansible-deployment"
|
||||
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/os-ansible-deployment"
|
||||
@echo "# mkdir -p $$HOME/.local/share/devhelp/openstack-ansible"
|
||||
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openstack-ansible"
|
||||
@echo "# devhelp"
|
||||
|
||||
epub:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# os-ansible-deployment documentation build configuration file, created by
|
||||
# openstack-ansible documentation build configuration file, created by
|
||||
# sphinx-quickstart on Mon Apr 13 20:42:26 2015.
|
||||
#
|
||||
# This file is execfile()d with the current directory set to its
|
||||
|
@ -46,9 +46,9 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = 'os-ansible-deployment'
|
||||
copyright = '2015, os-ansible-deployment contributors'
|
||||
author = 'os-ansible-deployment contributors'
|
||||
project = 'openstack-ansible'
|
||||
copyright = '2015, openstack-ansible contributors'
|
||||
author = 'openstack-ansible contributors'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
|
@ -200,7 +200,7 @@ html_static_path = ['_static']
|
|||
# html_search_scorer = 'scorer.js'
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = 'os-ansible-deploymentdoc'
|
||||
htmlhelp_basename = 'openstack-ansibledoc'
|
||||
|
||||
# -- Options for LaTeX output ---------------------------------------------
|
||||
|
||||
|
@ -222,9 +222,9 @@ latex_elements = {
|
|||
# (source start file, target name, title,
|
||||
# author, documentclass [howto, manual, or own class]).
|
||||
latex_documents = [
|
||||
(master_doc, 'os-ansible-deployment.tex',
|
||||
'os-ansible-deployment Documentation',
|
||||
'os-ansible-deployment contributors', 'manual'),
|
||||
(master_doc, 'openstack-ansible.tex',
|
||||
'openstack-ansible Documentation',
|
||||
'openstack-ansible contributors', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
|
@ -253,8 +253,8 @@ latex_documents = [
|
|||
# One entry per manual page. List of tuples
|
||||
# (source start file, name, description, authors, manual section).
|
||||
man_pages = [
|
||||
(master_doc, 'os-ansible-deployment',
|
||||
'os-ansible-deployment Documentation',
|
||||
(master_doc, 'openstack-ansible',
|
||||
'openstack-ansible Documentation',
|
||||
[author], 1)
|
||||
]
|
||||
|
||||
|
@ -268,9 +268,9 @@ man_pages = [
|
|||
# (source start file, target name, title, author,
|
||||
# dir menu entry, description, category)
|
||||
texinfo_documents = [
|
||||
(master_doc, 'os-ansible-deployment',
|
||||
'os-ansible-deployment Documentation',
|
||||
author, 'os-ansible-deployment', 'One line description of project.',
|
||||
(master_doc, 'openstack-ansible',
|
||||
'openstack-ansible Documentation',
|
||||
author, 'openstack-ansible', 'One line description of project.',
|
||||
'Miscellaneous'),
|
||||
]
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Extending os-ansible-deployment
|
||||
Extending openstack-ansible
|
||||
===============================
|
||||
|
||||
The os-ansible-deployment project provides a basic OpenStack environment, but
|
||||
The openstack-ansible project provides a basic OpenStack environment, but
|
||||
many deployers will wish to extend the environment based on their needs. This
|
||||
could include installing extra services, changing package versions, or
|
||||
overriding existing variables.
|
||||
|
@ -9,17 +9,17 @@ overriding existing variables.
|
|||
Using these extension points, deployers can provide a more 'opinionated'
|
||||
installation of OpenStack that may include their own software.
|
||||
|
||||
Including os-ansible-deployment in your project
|
||||
Including openstack-ansible in your project
|
||||
-----------------------------------------------
|
||||
|
||||
Including the os-ansible-deployment repository within another project can be
|
||||
Including the openstack-ansible repository within another project can be
|
||||
done in several ways.
|
||||
|
||||
1. A git submodule pointed to a released tag.
|
||||
2. A script to automatically perform a git checkout of
|
||||
os-ansible-deployment
|
||||
openstack-ansible
|
||||
|
||||
When including os-ansible-deployment in a project, consider using a parallel
|
||||
When including openstack-ansible in a project, consider using a parallel
|
||||
directory structure as shown in the `ansible.cfg files`_ section.
|
||||
|
||||
Also note that copying files into directories such as `env.d`_ or
|
||||
|
@ -30,28 +30,28 @@ ansible.cfg files
|
|||
-----------------
|
||||
|
||||
You can create your own playbook, variable, and role structure while still
|
||||
including the os-ansible-deployment roles and libaries by putting an
|
||||
including the openstack-ansible roles and libaries by putting an
|
||||
``ansible.cfg`` file in your ``playbooks`` directory.
|
||||
|
||||
The relevant options for Ansible 1.9 (included in os-ansible-deployment)
|
||||
The relevant options for Ansible 1.9 (included in openstack-ansible)
|
||||
are as follows:
|
||||
|
||||
``library``
|
||||
This variable should point to
|
||||
``os-ansible-deployment/playbooks/library``. Doing so allows roles and
|
||||
playbooks to access os-ansible-deployment's included Ansible modules.
|
||||
``openstack-ansible/playbooks/library``. Doing so allows roles and
|
||||
playbooks to access openstack-ansible's included Ansible modules.
|
||||
``roles_path``
|
||||
This variable should point to
|
||||
``os-ansible-deployment/playbooks/roles``. This allows Ansible to
|
||||
properly look up any os-ansible-deployment roles that extension roles
|
||||
``openstack-ansible/playbooks/roles``. This allows Ansible to
|
||||
properly look up any openstack-ansible roles that extension roles
|
||||
may reference.
|
||||
``inventory``
|
||||
This variable should point to
|
||||
``os-ansible-deployment/playbooks/inventory``. With this setting,
|
||||
``openstack-ansible/playbooks/inventory``. With this setting,
|
||||
extensions have access to the same dynamic inventory that
|
||||
os-ansible-deployment uses.
|
||||
openstack-ansible uses.
|
||||
|
||||
Note that the paths to the ``os-ansible-deployment`` top level directory can be
|
||||
Note that the paths to the ``openstack-ansible`` top level directory can be
|
||||
relative in this file.
|
||||
|
||||
Consider this directory structure::
|
||||
|
@ -61,30 +61,30 @@ Consider this directory structure::
|
|||
|- custom_stuff
|
||||
| |
|
||||
| |- playbooks
|
||||
|- os-ansible-deployment
|
||||
|- openstack-ansible
|
||||
| |
|
||||
| |- playbooks
|
||||
|
||||
The variables in ``my_project/custom_stuff/playbooks/ansible.cfg`` would use
|
||||
``../os-ansible-deployment/playbooks/<directory>``.
|
||||
``../openstack-ansible/playbooks/<directory>``.
|
||||
|
||||
|
||||
env.d
|
||||
-----
|
||||
|
||||
The os-ansible-deployment default environment, including container and host
|
||||
The openstack-ansible default environment, including container and host
|
||||
group mappings, resides in ``/etc/openstack_deploy/openstack_environment.yml``.
|
||||
|
||||
The ``/etc/openstack_deploy/env.d`` directory sources all YAML files into the
|
||||
deployed environment, allowing a deployer to define additional group mappings
|
||||
without having to edit the ``openstack_environment.yml`` file, which is
|
||||
controlled by the os-ansible-deployment project itself.
|
||||
controlled by the openstack-ansible project itself.
|
||||
|
||||
conf.d
|
||||
------
|
||||
|
||||
Common OpenStack services and their configuration are defined by
|
||||
os-ansible-deployment in the
|
||||
openstack-ansible in the
|
||||
``/etc/openstack_deploy/openstack_user_config.yml`` settings file.
|
||||
|
||||
Additional services should be defined with a YAML file in
|
||||
|
@ -99,7 +99,7 @@ sourced in any ``openstack-ansible`` command. Alternatively, the files can be
|
|||
sourced with the ``-e`` parameter of the ``ansible-playbook`` command.
|
||||
|
||||
``user_variables.yml`` and ``user_secrets.yml`` are used directly by
|
||||
os-ansible-deployment; adding custom values here is not recommended.
|
||||
openstack-ansible; adding custom values here is not recommended.
|
||||
|
||||
``user_extras_variables.yml`` and ``users_extras_secrets.yml`` are provided
|
||||
and can contain deployer's custom values, but deployers can add any other
|
||||
|
@ -114,6 +114,6 @@ in alphanumeric order by ``openstack-ansible``.
|
|||
Adding Galaxy roles
|
||||
-------------------
|
||||
|
||||
Any roles defined in ``os-ansible-deployment/ansible-role-requirements.yml``
|
||||
Any roles defined in ``openstack-ansible/ansible-role-requirements.yml``
|
||||
will be installed by the
|
||||
``os-ansible-deployment/scripts/bootstrap-ansible.sh`` script.
|
||||
``openstack-ansible/scripts/bootstrap-ansible.sh`` script.
|
||||
|
|
|
@ -2,7 +2,7 @@ Developer Documentation
|
|||
=======================
|
||||
|
||||
In this section, you will find documentation relevant to developing
|
||||
os-ansible-deployment.
|
||||
openstack-ansible.
|
||||
|
||||
Contents:
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ There is an `openstack-ansible` command installed by the
|
|||
command and provides the `/etc/openstack_deploy/user_*.yml` variable files
|
||||
to the playbooks.
|
||||
|
||||
All of the playbooks should be run within the `os-ansible-deployment/playbooks`
|
||||
All of the playbooks should be run within the `openstack-ansible/playbooks`
|
||||
directory
|
||||
|
||||
Setting up the Hosts
|
||||
|
|
|
@ -45,7 +45,7 @@ gate-check-commit.sh
|
|||
|
||||
The ``gate-check-commit.sh`` script executes a suite of tests necessary for
|
||||
each commit to the repository. By default, the script runs the bootstrap
|
||||
scripts, builds an *all-in-one* deployment of OSAD, and runs various Tempest
|
||||
scripts, builds an *all-in-one* deployment of OSA, and runs various Tempest
|
||||
tests on it.
|
||||
|
||||
Configurable environment variables:
|
||||
|
@ -83,7 +83,7 @@ run-tempest.sh
|
|||
|
||||
The ``run-tempest.sh`` script runs Tempest tests from the first utility
|
||||
container. The ``check-gate-commit.sh`` script usually invokes this
|
||||
script after it completes the OSAD deployment.
|
||||
script after it completes the OSA deployment.
|
||||
|
||||
Configurable environment variables:
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.. os-ansible-deployment documentation master file, created by
|
||||
.. openstack-ansible documentation master file, created by
|
||||
sphinx-quickstart on Mon Apr 13 20:42:26 2015.
|
||||
You can adapt this file completely to your liking, but it should at least
|
||||
contain the root `toctree` directive.
|
||||
|
||||
Welcome to os-ansible-deployment's documentation!
|
||||
Welcome to openstack-ansible's documentation!
|
||||
=================================================
|
||||
|
||||
|
||||
|
|
|
@ -4,22 +4,22 @@ Appendix A. Configuration files
|
|||
-------------------------------
|
||||
|
||||
`openstack_user_config.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/openstack_user_config.yml.example>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/openstack_user_config.yml.example>`_
|
||||
|
||||
`user_variables.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/user_variables.yml>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/user_variables.yml>`_
|
||||
|
||||
`user_secrets.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/user_secrets.yml>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/user_secrets.yml>`_
|
||||
|
||||
`openstack_environment.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/openstack_environment.yml>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/openstack_environment.yml>`_
|
||||
|
||||
`swift.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/conf.d/swift.yml.example>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/conf.d/swift.yml.example>`_
|
||||
|
||||
`extra_container.yml
|
||||
<https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/etc/openstack_deploy/env.d/extra_container.yml.example>`_
|
||||
<https://raw.githubusercontent.com/openstack/openstack-ansible/master/etc/openstack_deploy/env.d/extra_container.yml.example>`_
|
||||
|
||||
--------------
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ The Telemetry module(Ceilometer) performs the following functions:
|
|||
|
||||
- Creates alarms when collected data breaks defined rules.
|
||||
|
||||
Ceilometer on OSAD requires a monogodb backend to be configured prior to running the ceilometer playbooks. A connection string will then need to be given in the ``user_variables.yml`` file(See section Configuring User Data below).
|
||||
Ceilometer on OSA requires a monogodb backend to be configured prior to running the ceilometer playbooks. A connection string will then need to be given in the ``user_variables.yml`` file(See section Configuring User Data below).
|
||||
|
||||
|
||||
Setting up a Mongodb database for ceilometer
|
||||
|
|
|
@ -20,7 +20,7 @@ back up to an external Object Storage installation.
|
|||
|
||||
#. By default, Block Storage will use the access credentials of the user
|
||||
initiating the backup. Default values are set in the
|
||||
``/opt/os-ansible-deployment/playbooks/roles/os_cinder/defaults/main.yml``
|
||||
``/opt/openstack-ansible/playbooks/roles/os_cinder/defaults/main.yml``
|
||||
file. You can override those defaults by setting variables in
|
||||
``/etc/openstack_deploy/user_variables.yml`` to change how Block
|
||||
Storage performs backups. As needed, add and edit any of the
|
||||
|
|
|
@ -25,7 +25,7 @@ values for the variables in each file that contains service credentials:
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
$ cd /opt/os-ansible-deployment/scripts
|
||||
$ cd /opt/openstack-ansible/scripts
|
||||
$ python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ For evaluation, testing, and development, HAProxy can temporarily
|
|||
provide load balancing services in lieu of hardware load balancers. The
|
||||
default HAProxy configuration does not provide highly-available load
|
||||
balancing services. For production deployments, deploy a hardware load
|
||||
balancer prior to deploying OSAD.
|
||||
balancer prior to deploying OSA.
|
||||
|
||||
- In the ``/etc/openstack_deploy/openstack_user_config.yml`` file, add
|
||||
the ``haproxy_hosts`` section with one or more infrastructure target
|
||||
|
|
|
@ -4,7 +4,7 @@ Prerequisites
|
|||
-------------
|
||||
|
||||
#. Recursively copy the contents of the
|
||||
``/opt/os-ansible-deployment/etc/openstack_deploy`` directory to the
|
||||
``/opt/openstack-ansible/etc/openstack_deploy`` directory to the
|
||||
``/etc/openstack_deploy`` directory.
|
||||
|
||||
#. Change to the ``/etc/openstack_deploy`` directory.
|
||||
|
|
|
@ -30,7 +30,7 @@ existing deployment.
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
$ cd /opt/os-ansible-deployment/playbooks
|
||||
$ cd /opt/openstack-ansible/playbooks
|
||||
$ openstack-ansible os-swift-install.yml
|
||||
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ through ``sdg``.
|
|||
$ mount /srv/node/sdg
|
||||
|
||||
To view an annotated example of the ``swift.yml`` file, see `Appendix A,
|
||||
*OSAD configuration files* <app-osad-configfiles.html>`__.
|
||||
*OSA configuration files* <app-configfiles.html>`__.
|
||||
|
||||
For the following mounted devices:
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ Service will no longer be available.
|
|||
|
||||
This procedure requires the following:
|
||||
|
||||
- OSAD Kilo (v11)
|
||||
- OSA Kilo (v11)
|
||||
|
||||
- Object Storage v 2.2.0
|
||||
|
||||
|
@ -62,7 +62,7 @@ This procedure requires the following:
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
$ cd /opt/os-ansible-deployment/playbooks
|
||||
$ cd /opt/openstack-ansible/playbooks
|
||||
$ openstack-ansible os-glance-install.yml --tags "glance-config"
|
||||
|
||||
--------------
|
||||
|
|
|
@ -15,8 +15,8 @@ playbooks. The values in the ``swift_hosts`` section supersede values in
|
|||
the ``swift`` section.
|
||||
|
||||
To view the configuration files, including information about which
|
||||
variables are required and which are optional, see `Appendix A, *OSAD
|
||||
configuration files* <app-osad-configfiles.html>`__.
|
||||
variables are required and which are optional, see `Appendix A, *OSA
|
||||
configuration files* <app-configfiles.html>`__.
|
||||
|
||||
--------------
|
||||
|
||||
|
|
|
@ -5,17 +5,17 @@ Installing source and dependencies
|
|||
|
||||
Install the source and dependencies for the deployment host.
|
||||
|
||||
#. Clone the OSAD repository into the ``/opt/os-ansible-deployment``
|
||||
#. Clone the OSA repository into the ``/opt/openstack-ansible``
|
||||
directory:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# git clone -b TAG https://github.com/stackforge/os-ansible-deployment.git /opt/os-ansible-deploymemt
|
||||
# git clone -b TAG https://github.com/openstack/openstack-ansible.git /opt/os-ansible-deploymemt
|
||||
|
||||
|
||||
Replace *``TAG``* with the current stable release tag.
|
||||
|
||||
#. Change to the ``/opt/os-ansible-deployment`` directory, and run the
|
||||
#. Change to the ``/opt/openstack-ansible`` directory, and run the
|
||||
Ansible bootstrap script:
|
||||
|
||||
.. code-block:: bash
|
|
@ -7,7 +7,7 @@ Chapter 3. Deployment host
|
|||
|
||||
deploymenthost-os.rst
|
||||
deploymenthost-add.rst
|
||||
deploymenthost-osad.rst
|
||||
deploymenthost-osa.rst
|
||||
deploymenthost-sshkeys.rst
|
||||
|
||||
|
||||
|
@ -15,8 +15,8 @@ Chapter 3. Deployment host
|
|||
|
||||
.. image:: figures/workflow-deploymenthost.png
|
||||
|
||||
The OSAD installation process recommends one deployment host. The
|
||||
deployment host contains Ansible and orchestrates the OSAD installation
|
||||
The OSA installation process recommends one deployment host. The
|
||||
deployment host contains Ansible and orchestrates the OSA installation
|
||||
on the target hosts. One of the target hosts, preferably one of the
|
||||
infrastructure variants, can be used as the deployment host. To use a
|
||||
deployment host as a target host, follow the steps in `Chapter 4,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Running the foundation playbook
|
||||
-------------------------------
|
||||
|
||||
#. Change to the ``/opt/os-ansible-deployment/playbooks`` directory.
|
||||
#. Change to the ``/opt/openstack-ansible/playbooks`` directory.
|
||||
|
||||
#. Run the host setup playbook, which runs a series of sub-playbooks:
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Running the infrastructure playbook
|
||||
-----------------------------------
|
||||
|
||||
#. Change to the ``/opt/os-ansible-deployment/playbooks`` directory.
|
||||
#. Change to the ``/opt/openstack-ansible/playbooks`` directory.
|
||||
|
||||
#. Run the infrastructure setup playbook, which runs a series of
|
||||
sub-playbooks:
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Running the OpenStack playbook
|
||||
------------------------------
|
||||
|
||||
#. Change to the ``/opt/os-ansible-deployment/playbooks`` directory.
|
||||
#. Change to the ``/opt/openstack-ansible/playbooks`` directory.
|
||||
|
||||
#. Run the OpenStack setup playbook, which runs a series of
|
||||
sub-playbooks:
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
- `2. Overview <overview.html>`__
|
||||
|
||||
- `About OpenStack Ansible Deployment <overview-osad>`__
|
||||
- `About OpenStack Ansible Deployment <overview-osa>`__
|
||||
- `Ansible <overview-ansible.html>`__
|
||||
- `Linux Containers (LXC) <overview-lxc.html>`__
|
||||
- `Host layout <overview-hostlayout.html>`__
|
||||
|
@ -19,7 +19,7 @@
|
|||
- `Configuring the operating
|
||||
system <deploymenthost-add.html>`__
|
||||
- `Installing source and
|
||||
dependencies <deploymenthost-osad.html>`__
|
||||
dependencies <deploymenthost-osa.html>`__
|
||||
- `Configuring Secure Shell (SSH)
|
||||
keys <deploymenthost-sshkeys.html>`__
|
||||
|
||||
|
@ -105,6 +105,6 @@
|
|||
- `Rebuilding a
|
||||
container <ops-galera-recoverycontainer.html>`__
|
||||
|
||||
- `A. OSAD configuration files <app-configfiles.html>`__
|
||||
- `A. OSA configuration files <app-configfiles.html>`__
|
||||
|
||||
- `B. Additional resources <app-resources.html>`__
|
||||
|
|
|
@ -19,7 +19,7 @@ cluster.
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
$ cd /opt/os-ansible-deployment/playbooks
|
||||
$ cd /opt/openstack-ansible/playbooks
|
||||
$ openstack-ansible setup-everything.yml \
|
||||
rsyslog-config.yml --limit NEW_HOST_NAME
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ For more information, see `Ansible - Intro to
|
|||
Playbooks <http://docs.ansible.com/playbooks_intro.html>`__.
|
||||
|
||||
In this guide, we refer to the host running Ansible playbooks as
|
||||
the *deployment host* and the hosts on which Ansible installs OSAD as the
|
||||
the *deployment host* and the hosts on which Ansible installs OSA as the
|
||||
*target hosts*.
|
||||
|
||||
A recommended minimal layout for deployments involves five target
|
||||
|
|
|
@ -17,8 +17,8 @@ recommended. Block Storage hosts require an LVM volume group named
|
|||
requirements" <overview-requirements.html>`__ and `the section
|
||||
called "Configuring LVM" <targethosts-configlvm.html>`__ for more information.
|
||||
|
||||
The hosts are called *target hosts* because Ansible deploys the OSAD
|
||||
environment within these hosts. The OSAD environment also recommends a
|
||||
The hosts are called *target hosts* because Ansible deploys the OSA
|
||||
environment within these hosts. The OSA environment also recommends a
|
||||
*deployment host* from which Ansible orchestrates the deployment
|
||||
process. One of the target hosts can function as the deployment host.
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ physical, logical, and virtual network interfaces within a host. After
|
|||
creating a bridge, the network interfaces are virtually "plugged in" to
|
||||
it.
|
||||
|
||||
OSAD uses bridges to connect physical and logical network interfaces
|
||||
OSA uses bridges to connect physical and logical network interfaces
|
||||
on the host to virtual network interfaces within containers.
|
||||
|
||||
*Namespaces* provide logically separate layer 3 environments (similar to
|
||||
|
@ -103,7 +103,7 @@ containers.
|
|||
|
||||
.. image:: figures/networkarch-container-external.png
|
||||
|
||||
By default, OSAD installs the Compute service in a bare metal
|
||||
By default, OSA installs the Compute service in a bare metal
|
||||
environment rather than within a container. `Figure 2.4, "Bare/Metal
|
||||
network
|
||||
architecture" <overview-hostnetworking.html#fig_overview_networkarch-bare>`__
|
||||
|
|
|
@ -3,15 +3,15 @@
|
|||
About OpenStack Ansible Deployment
|
||||
----------------------------------
|
||||
|
||||
OS-Ansible-Deployment uses the Ansible IT automation framework to
|
||||
create an OpenStack cluster on Ubuntu Linux. OpenStack components are
|
||||
OpenStack-Ansible uses the Ansible IT automation framework to
|
||||
create an OpenStack cluster on Ubuntu Linux. OpenStack components are
|
||||
installed into Linux Containers (LXC) for isolation and ease of
|
||||
maintenance.
|
||||
|
||||
| OpenStack Ansible Deployment
|
||||
|
||||
This documentation is intended for deployers of the OpenStack Ansible
|
||||
deployment system who are interested in installing an OpenStack. The
|
||||
This documentation is intended for deployers of the OpenStack Ansible
|
||||
deployment system who are interested in installing an OpenStack. The
|
||||
document is for informational purposes only and is provided "AS IS."
|
||||
|
||||
Third-party trademarks and tradenames appearing in this document are the
|
|
@ -3,7 +3,7 @@
|
|||
Installation workflow
|
||||
---------------------
|
||||
|
||||
This diagram shows the general workflow associated with OSAD
|
||||
This diagram shows the general workflow associated with OSA
|
||||
installation.
|
||||
|
||||
**Figure 2.7. Installation workflow**
|
||||
|
|
|
@ -5,7 +5,7 @@ Chapter 2. Overview
|
|||
|
||||
.. toctree::
|
||||
|
||||
overview-osad.rst
|
||||
overview-osa.rst
|
||||
overview-ansible.rst
|
||||
overview-lxc.rst
|
||||
overview-hostlayout.rst
|
||||
|
|
|
@ -42,7 +42,7 @@ following optional components:
|
|||
``br-storage`` bridge with a static IP address.
|
||||
|
||||
For more information, see `OpenStack Ansible
|
||||
Networking <https://github.com/stackforge/os-ansible-deployment/blob/10.1.0/etc/network/README.html>`__.
|
||||
Networking <https://github.com/openstack/openstack-ansible/blob/10.1.0/etc/network/README.html>`__.
|
||||
|
||||
--------------
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ Chapter 4. Target hosts
|
|||
|
||||
.. image:: figures/workflow-targethosts.png
|
||||
|
||||
The OSAD installation process recommends at least five target
|
||||
The OSA installation process recommends at least five target
|
||||
hosts that will contain the OpenStack environment and supporting
|
||||
infrastructure. On each target host, perform the following tasks:
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# ========
|
||||
#
|
||||
# This file contains the configuration for the OpenStack Ansible Deployment
|
||||
# (OSAD) Object Storage (swift) service. Only enable these options for
|
||||
# (OSA) Object Storage (swift) service. Only enable these options for
|
||||
# deployments that contain the Object Storage service. For more information on
|
||||
# these options, see the documentation at
|
||||
#
|
||||
|
@ -28,7 +28,7 @@
|
|||
# file containing only necessary options for your environment
|
||||
# before deployment.
|
||||
#
|
||||
# OSAD implements PyYAML to parse YAML files and therefore supports structure
|
||||
# OSA implements PyYAML to parse YAML files and therefore supports structure
|
||||
# and formatting options that augment traditional YAML. For example, aliases
|
||||
# or references. For more information on PyYAML, see the documentation at
|
||||
#
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# ========
|
||||
#
|
||||
# This file contains the configuration for OpenStack Ansible Deployment
|
||||
# (OSAD) core services. Optional service configuration resides in the
|
||||
# (OSA) core services. Optional service configuration resides in the
|
||||
# conf.d directory.
|
||||
#
|
||||
# You can customize the options in this file and copy it to
|
||||
|
@ -25,7 +25,7 @@
|
|||
# file containing only necessary options for your environment
|
||||
# before deployment.
|
||||
#
|
||||
# OSAD implements PyYAML to parse YAML files and therefore supports structure
|
||||
# OSA implements PyYAML to parse YAML files and therefore supports structure
|
||||
# and formatting options that augment traditional YAML. For example, aliases
|
||||
# or references. For more information on PyYAML, see the documentation at
|
||||
#
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# to user Ceph in OSAD, you need to
|
||||
# to user Ceph in OSA, you need to
|
||||
# - have the needed pools and a client user (for glance, cinder and/or nova)
|
||||
# pre-provisioned in your ceph cluster; OSAD assumes to have root access to
|
||||
# pre-provisioned in your ceph cluster; OSA assumes to have root access to
|
||||
# the monitor hosts
|
||||
# - configure / overrules following defaults in osad's user config
|
||||
# - configure / overrules following defaults in osa's user config
|
||||
# - some ceph specific vars are (also) part of other role defaults:
|
||||
# * glance
|
||||
# * nova
|
||||
|
|
|
@ -245,10 +245,10 @@ def _arguments():
|
|||
arguments_dict=arguments_dict,
|
||||
epilog='Licensed Apache2',
|
||||
title='Discover all of the requirements within the'
|
||||
' os-ansible-deployment project.',
|
||||
' openstack-ansible project.',
|
||||
detail='Requirement lookup',
|
||||
description='Discover all of the requirements within the'
|
||||
' os-ansible-deployment project.',
|
||||
' openstack-ansible project.',
|
||||
env_name='OS_ANSIBLE'
|
||||
).arg_parser()
|
||||
|
||||
|
|
|
@ -55,8 +55,8 @@ trap my_trap_handler ERR
|
|||
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
# Defined variables.
|
||||
GIT_REPO="${GIT_REPO:-https://github.com/stackforge/os-ansible-deployment}"
|
||||
GITHUB_API_ENDPOINT="${GITHUB_API_ENDPOINT:-https://api.github.com/repos/stackforge/os-ansible-deployment}"
|
||||
GIT_REPO="${GIT_REPO:-https://github.com/openstack/openstack-ansible}"
|
||||
GITHUB_API_ENDPOINT="${GITHUB_API_ENDPOINT:-https://api.github.com/repos/openstack/openstack-ansible}"
|
||||
|
||||
# Predefined working directory.
|
||||
WORK_DIR="${WORK_DIR:-/tmp/openstack-ansible-deployment}"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
heat_template_version: 2013-05-23
|
||||
description: Heat template to deploy OS-Ansible-Deployment
|
||||
description: Heat template to deploy OpenStack-Ansible
|
||||
parameters:
|
||||
ssh_key_name:
|
||||
type: string
|
||||
|
@ -26,11 +26,11 @@ parameters:
|
|||
description: Name Flavor to use for server
|
||||
server_name:
|
||||
type: string
|
||||
default: OSAD-AIO
|
||||
default: OSA-AIO
|
||||
description: The Instance Name
|
||||
install_script_url:
|
||||
type: string
|
||||
default: https://raw.githubusercontent.com/stackforge/os-ansible-deployment/master/scripts/run-aio-build.sh
|
||||
default: https://raw.githubusercontent.com/openstack/openstack-ansible/master/scripts/run-aio-build.sh
|
||||
description: The aio script installation URL
|
||||
frozen_repo_url:
|
||||
type: string
|
||||
|
@ -38,7 +38,7 @@ parameters:
|
|||
description: URL to the frozen
|
||||
repo_url:
|
||||
type: string
|
||||
default: https://github.com/stackforge/os-ansible-deployment.git
|
||||
default: https://github.com/openstack/openstack-ansible.git
|
||||
description: The repository URL
|
||||
repo_branch:
|
||||
type: string
|
||||
|
@ -51,21 +51,21 @@ parameters:
|
|||
type: string
|
||||
description: Name of the security group
|
||||
outputs:
|
||||
OSADAIO_public_ip:
|
||||
OSAAIO_public_ip:
|
||||
description: The public IP address of the newly configured Server.
|
||||
value: { get_attr: [ OSADAIO, first_address ] }
|
||||
OSADAIO_password:
|
||||
value: { get_attr: [ OSAAIO, first_address ] }
|
||||
OSAAIO_password:
|
||||
description: The password for all the things.
|
||||
value: { get_attr: [ OSADAIO_random_pass, value ] }
|
||||
value: { get_attr: [ OSAAIO_random_pass, value ] }
|
||||
resources:
|
||||
OSADAIO_random_pass:
|
||||
OSAAIO_random_pass:
|
||||
type: OS::Heat::RandomString
|
||||
OSADAIO_port:
|
||||
OSAAIO_port:
|
||||
type: OS::Neutron::Port
|
||||
properties:
|
||||
network_id: { get_param: net_id }
|
||||
security_groups: [{ get_param: sec_group }]
|
||||
OSADAIO:
|
||||
OSAAIO:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: { get_param: flavor_name }
|
||||
|
@ -73,7 +73,7 @@ resources:
|
|||
name: { get_param: server_name }
|
||||
key_name: { get_param: ssh_key_name }
|
||||
networks:
|
||||
- port: { get_resource: OSADAIO_port }
|
||||
- port: { get_resource: OSAAIO_port }
|
||||
user_data:
|
||||
str_replace:
|
||||
params:
|
|
@ -18,9 +18,9 @@
|
|||
set -e -u +x
|
||||
|
||||
## Variables -----------------------------------------------------------------
|
||||
export REPO_URL=${REPO_URL:-"https://github.com/stackforge/os-ansible-deployment.git"}
|
||||
export REPO_URL=${REPO_URL:-"https://github.com/openstack/openstack-ansible.git"}
|
||||
export REPO_BRANCH=${REPO_BRANCH:-"master"}
|
||||
export WORKING_FOLDER=${WORKING_FOLDER:-"/opt/stackforge/os-ansible-deployment"}
|
||||
export WORKING_FOLDER=${WORKING_FOLDER:-"/opt/openstack/openstack-ansible"}
|
||||
# On normal AIO build the script should do everything possible to try for success
|
||||
export MAX_RETRIES=${MAX_RETRIES:-"5"}
|
||||
|
||||
|
@ -45,7 +45,7 @@ bash scripts/gate-check-commit.sh
|
|||
cat > /etc/update-motd.d/20-openstack<< EOF
|
||||
#!/usr/bin/env bash
|
||||
echo ""
|
||||
echo "############ os-ansible-deployment all-in-one build #############"
|
||||
echo "############ openstack-ansible all-in-one build #############"
|
||||
echo ""
|
||||
echo " OpenStack Services are now listening on $(ip -o -4 addr show dev eth0 | awk -F '[ /]+' '/global/ {print $4}')"
|
||||
echo ""
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
clear
|
||||
|
||||
# NOTICE: To run this in an automated fashion run the script via
|
||||
# root@HOSTNAME:/opt/os-ansible-deployment# echo "YES" | bash scripts/run-upgrade.sh
|
||||
# root@HOSTNAME:/opt/openstack-ansible# echo "YES" | bash scripts/run-upgrade.sh
|
||||
|
||||
# Notify the user.
|
||||
echo -e "
|
||||
|
|
|
@ -301,7 +301,7 @@ fi
|
|||
if [ ! -d "etc" -a ! -d "scripts" -a ! -d "playbooks" ]; then
|
||||
info_block "** ERROR **"
|
||||
echo "Please execute this script from the root directory of the cloned source code."
|
||||
echo -e "Example: /opt/os-ansible-deployment/\n"
|
||||
echo -e "Example: /opt/openstack-ansible/\n"
|
||||
exit_state 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -182,7 +182,7 @@ pushd playbooks
|
|||
- /opt/*nova*
|
||||
- /opt/*pip*
|
||||
- /opt/*repo*
|
||||
- /opt/*stackforge*
|
||||
- /opt/*openstack*
|
||||
- /root/.pip
|
||||
- /var/lib/neutron
|
||||
- /var/lib/nova
|
||||
|
|
Loading…
Reference in New Issue