KEERO-314 - Fix all occurrences of old names (keero, glazier) in conductor + CRLF->LF

README.rst

@@ -1,8 +1,8 @@
-Glazier Conductor README
+Murano Conductor README
 ========================
-Conductor is an Glazier orchestration engine that transforms object model sent by
-REST API service into a series of Heat and Glazier-Agent commands
+Conductor is an Murano orchestration engine that transforms object model sent by
+REST API service into a series of Heat and Murano-Agent commands
 
 SEE ALSO
 --------
-* `Keero <http://keero.mirantis.com>`__
+* `Murano <http://murano.mirantis.com>`__

data/init.ps1

@@ -1,7 +1,7 @@
 #ps1
 
 $WindowsAgentConfigBase64 = '%WINDOWS_AGENT_CONFIG_BASE64%'
-$WindowsAgentConfigFile = "C:\Keero\Agent\WindowsAgent.exe.config"
+$WindowsAgentConfigFile = "C:\Murano\Agent\WindowsAgent.exe.config"
 
 $NewComputerName = '%INTERNAL_HOSTNAME%'
 
@@ -9,12 +9,12 @@ $RestartRequired = $false
 
 Import-Module CoreFunctions
 
-Write-Log "Updating Keero Windows Agent."
-Stop-Service "Keero Agent"
+Write-Log "Updating Murano Windows Agent."
+Stop-Service "Murano Agent"
 Backup-File $WindowsAgentConfigFile
 Remove-Item $WindowsAgentConfigFile -Force
 ConvertFrom-Base64String -Base64String $WindowsAgentConfigBase64 -Path $WindowsAgentConfigFile
-Exec sc.exe 'config','"Keero Agent"','start=','delayed-auto'
+Exec sc.exe 'config','"Murano Agent"','start=','delayed-auto'
 Write-Log "Service has been updated."
 
 Write-Log "Renaming computer ..."
@@ -29,5 +29,5 @@ if ( $RestartRequired ) {
     Restart-Computer -Force
 }
 else {
-    Start-Service 'Keero Agent'
+    Start-Service 'Murano Agent'
 }

data/templates/cf/Windows.template

@@ -7,7 +7,7 @@
     "KeyName" : {
       "Description" : "Name of an existing Amazon EC2 key pair for RDP access",
       "Type" : "String",
-      "Default" : "keero_key"
+      "Default" : "murano-keys"
     },
     "InstanceType" : {
       "Description" : "Amazon EC2 instance type",

data/workflows/AD.xml

@@ -25,7 +25,7 @@
 			</parameter>
 			<parameter name="arguments">
 				<map>
-					<argument name="KeyName">keero-keys</argument>
+					<argument name="KeyName">murano-keys</argument>
 					<argument name="InstanceType">m1.medium</argument>
 					<argument name="ImageName">ws-2012-full</argument>
 				</map>

data/workflows/IIS.xml

@@ -25,7 +25,7 @@
 			</parameter>
 			<parameter name="arguments">
 				<map>
-					<argument name="KeyName">keero-keys</argument>
+					<argument name="KeyName">murano-keys</argument>
 					<argument name="InstanceType">m1.medium</argument>
 					<argument name="ImageName">ws-2012-full</argument>
 				</map>

doc/source/conf.py

@@ -218,7 +218,7 @@ htmlhelp_basename = 'conductordoc'
 # documentclass [howto/manual]).
 latex_documents = [
     ('index', 'Conductor.tex', u'Conductor Documentation',
-     u'Keero Team', 'manual'),
+     u'Murano Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

doc/source/index.rst

@@ -15,11 +15,11 @@
       under the License.
 
 =======================================================
-Welcome to Conductor, the Glazier orchestration engine!
+Welcome to Conductor, the Murano orchestration engine!
 =======================================================
 
-Conductor is an Glazier orchestration engine that transforms object model sent by
-REST API service into a series of Heat and Glazier-Agent commands
+Conductor is an Murano orchestration engine that transforms object model sent by
+REST API service into a series of Heat and Murano-Agent commands
 
 This document describes Conductor for contributors of the project.
 
@@ -31,20 +31,20 @@ Installation Guide
 Install
 -------
 
-    Check out sources to some directory (<home>/glazier):
+    Check out sources to some directory (<home>/murano):
 
-    smelikyan@work:~/git clone ssh://<user>@gerrit.mirantis.com:29418/keero/keero.git
+    smelikyan@work:~/git clone https://github.com/Mirantis/murano-conductor.git
 
     Install Conductor:
 
-    smelikyan@work:~/cd glazier/conductor && sudo python setup.py install
+    smelikyan@work:~/cd murano/conductor && sudo python setup.py install
 
 Configure
 ---------
 
     Open configuration file for editing:
 
-    smelikyan@work:~/cd glazier/conductor/etc && nano conductor.conf
+    smelikyan@work:~/cd murano/conductor/etc && nano conductor.conf
 
     Configure according to you environment:
     [DEFAULT]
@@ -59,14 +59,14 @@ Configure
     # this must be IP or hostname accessible from instances (VMs)
     host = YOUR.REAL.IP.HERE
     port = 5672
-    virtual_host = glazier
-    login = glazier
-    password = glazier
+    virtual_host = murano
+    login = murano
+    password = murano
 
 Run
 ----
 
 Run Conductor and supply valid configuration file:
 
-smelikyan@work:~/cd glazier/conductor && conductor --config-file=./glazier/conductor/etc/conductor.conf
+smelikyan@work:~/cd murano/conductor && conductor --config-file=./murano/conductor/etc/conductor.conf
 

etc/conductor.conf

@@ -9,6 +9,6 @@ auth_url = http://172.18.124.101:5000/v2.0
 [rabbitmq]
 host = 172.18.124.101
 port = 5672
-virtual_host = keero
-login = keero
-password = keero
+virtual_host = murano
+login = murano
+password = murano