'keero' and 'glazier' replaced by 'murano'

This commit is contained in:
Dmitry Teselkin 2013-04-25 16:27:00 +04:00
parent da4fc79d23
commit 204118e5df
15 changed files with 32 additions and 32 deletions

View File

@ -20,5 +20,5 @@ SDL's statements:
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__

View File

@ -1,11 +1,11 @@
Glazier Deployment Murano Deployment
================== ==================
This folder holds miscellaneous tools and scripts to deploy Glazier and it's components. This folder holds miscellaneous tools and scripts to deploy Murano and it's components.
A separate README.rst inside each folder holds more detailed information. A separate README.rst inside each folder holds more detailed information.
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__

View File

@ -7,5 +7,5 @@ These files should be passed to Sysprep.exe.
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__

View File

@ -1,7 +1,7 @@
Glazier Windows Agent README Murano Windows Agent README
============================ ============================
Glazier Windows Agent is a component that does all the work on a target node. Murano Windows Agent is a component that does all the work on a target node.
Currently only Windows nodes are supported. Currently only Windows nodes are supported.
Agent embeddes PowerShell engine which is the only execution engine. Agent embeddes PowerShell engine which is the only execution engine.
@ -25,4 +25,4 @@ All necessary configuration is performed during instance creation process. No ma
SEE ALSO SEE ALSO
-------- --------
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__

View File

@ -545,15 +545,15 @@ Function Get-ConfigDriveObject {
Function Update-AgentConfig { Function Update-AgentConfig {
param ( param (
[String] $RootPath = "C:\Keero\Agent" [String] $RootPath = "C:\Murano\Agent"
) )
try { try {
$MetaData = Get-ConfigDriveObject -MetaData -ErrorAction Stop $MetaData = Get-ConfigDriveObject -MetaData -ErrorAction Stop
if ($MetaData.meta -ne $null) { if ($MetaData.meta -ne $null) {
Stop-Service "Keero Agent" -Force Stop-Service "Murano Agent" -Force
Expand-Template -TemplateFile "$RootPath\WindowsAgent.exe.config.template" -OutputFile "$RootPath\WindowsAgent.exe.config" -ReplacementList $MetaData.meta Expand-Template -TemplateFile "$RootPath\WindowsAgent.exe.config.template" -OutputFile "$RootPath\WindowsAgent.exe.config" -ReplacementList $MetaData.meta
Start-Service "Keero Agent" Start-Service "Murano Agent"
} }
} }
catch { catch {

View File

@ -7,5 +7,5 @@ Windows PowerShell module is a convenient way to redictribute a set of PowerShel
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__

View File

@ -6,6 +6,6 @@ They are stored under this folder.
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__
* `CloudBase-Init <http://www.cloudbase.it/cloud-init-for-windows-instances/>`__ * `CloudBase-Init <http://www.cloudbase.it/cloud-init-for-windows-instances/>`__

View File

@ -5,7 +5,7 @@ from cloudbaseinit.plugins.base import *
from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.openstack.common import log as logging
opts = [ opts = [
cfg.StrOpt('agent_config_file', default='C:\\Keero\\Agent\\WindowsAgent.exe.config', help='') cfg.StrOpt('agent_config_file', default='C:\\Murano\\Agent\\WindowsAgent.exe.config', help='')
] ]
CONF = cfg.CONF CONF = cfg.CONF

View File

@ -1,6 +1,6 @@
Import-Module CoreFunctions Import-Module CoreFunctions
$ModuleBase = "C:\Keero\Modules" $ModuleBase = "C:\Murano\Modules"
$NewModule_Name = "ModuleName" $NewModule_Name = "ModuleName"
@ -9,7 +9,7 @@ $NewModule_Base64 = @'
'@ '@
$AgentConfig_Path = "C:\Keero\Agent\WindowsAgent.exe.config" $AgentConfig_Path = "C:\Murano\Agent\WindowsAgent.exe.config"
$AgentConfig_Base64 = @' $AgentConfig_Base64 = @'
%AGENT_CONFIG_BASE64% %AGENT_CONFIG_BASE64%
'@ '@

View File

@ -32,8 +32,8 @@ As *root* do the steps below:
su stack su stack
cd cd
git clone https://github.com/Mirantis/glazier-deployment.git git clone https://github.com/Mirantis/murano-deployment.git
cd glazier-deployment/devstack-scripts cd murano-deployment/devstack-scripts
* Check configuration files and start devstack * Check configuration files and start devstack
@ -44,6 +44,6 @@ As *root* do the steps below:
SEE ALSO SEE ALSO
======== ========
* `Glazier <http://glazier.mirantis.com>`__ * `Murano <http://murano.mirantis.com>`__
* `DevStack <http://devstack.org>`__ * `DevStack <http://devstack.org>`__

View File

@ -62,11 +62,11 @@ if [[ $INSTALL_MODE == 'compute' ]] ; then
fi fi
if [[ -z "$(sudo rabbitmqctl list_users | grep keero)" ]] ; then if [[ -z "$(sudo rabbitmqctl list_users | grep murano)" ]] ; then
echo "Adding RabbitMQ 'keero' user" echo "Adding RabbitMQ 'murano' user"
sudo rabbitmqctl add_user keero keero sudo rabbitmqctl add_user murano murano
else else
echo "User 'Keero' already exists." echo "User 'Murano' already exists."
fi fi
@ -100,11 +100,11 @@ nova secgroup-add-rule default udp 1 65535 0.0.0.0/0
nova secgroup-add-rule default icmp 0 8 0.0.0.0/0 nova secgroup-add-rule default icmp 0 8 0.0.0.0/0
if [[ -z "$(nova keypair-list | grep keero_key)" ]] ; then if [[ -z "$(nova keypair-list | grep murano_key)" ]] ; then
echo "Creating keypair 'keero_key' ..." echo "Creating keypair 'murano_key' ..."
nova keypair-add keero_key nova keypair-add murano_key
else else
echo "Keypair 'keero_key' already exists" echo "Keypair 'murano_key' already exists"
fi fi

View File

@ -67,7 +67,7 @@ $DEVSTACK_DIR/stack.sh
_echo "* Executing post-stack actions ..." _echo "* Executing post-stack actions ..."
source $DEVSTACK_DIR/openrc admin admin source $DEVSTACK_DIR/openrc admin admin
source $SCRIPTS_DIR/post-stack.sh no-localrc source $SCRIPTS_DIR/post-stack.sh no-localrc
#source $SCRIPTS_DIR/start-keero.sh no-localrc #source $SCRIPTS_DIR/start-murano.sh no-localrc
#=============================================================================== #===============================================================================

View File

@ -13,7 +13,7 @@ if [[ ! -d "$INSTALL_DIR/portas" ]] ; then
mkdir -p "$INSTALL_DIR/portas" mkdir -p "$INSTALL_DIR/portas"
fi fi
cp "$INSTALL_DIR/keero/portas/etc" "$INSTALL_DIR/portas/etc" cp "$INSTALL_DIR/murano/portas/etc" "$INSTALL_DIR/portas/etc"
screen_it portas "cd $INSTALL_DIR/portas && portas-api --config-file=$INSTALL_DIR/portas/etc/portas-api.conf" screen_it portas "cd $INSTALL_DIR/portas && portas-api --config-file=$INSTALL_DIR/portas/etc/portas-api.conf"
#================ #================
@ -22,5 +22,5 @@ screen_it portas "cd $INSTALL_DIR/portas && portas-api --config-file=$INSTALL_DI
# Starting Conductor # Starting Conductor
#=================== #===================
screen_it conductor "cd $INSTALL_DIR/keero/conductor && bash ./tools/with_venv.sh ./bin/app.py" screen_it conductor "cd $INSTALL_DIR/murano/conductor && bash ./tools/with_venv.sh ./bin/app.py"
#=================== #===================

View File

@ -31,7 +31,7 @@ $DEVSTACK_DIR/unstack.sh
#=============================================================================== #===============================================================================
_echo "* Executing post-unstack actions ..." _echo "* Executing post-unstack actions ..."
source $SCRIPTS_DIR/post-unstack.sh no-localrc source $SCRIPTS_DIR/post-unstack.sh no-localrc
#source $SCRIPTS_DIR/stop-keero.sh no-localrc #source $SCRIPTS_DIR/stop-murano.sh no-localrc
#=============================================================================== #===============================================================================

View File

@ -5,7 +5,7 @@ if [[ -z "$1" ]] ; then
source $SCRIPTS_DIR/localrc source $SCRIPTS_DIR/localrc
fi fi
# Stopping Keero components # Stopping Murano components
#========================== #==========================
for serv in conductor portas ; do for serv in conductor portas ; do
screen -S $SCREEN_NAME -p $serv -X kill screen -S $SCREEN_NAME -p $serv -X kill