Adds Hostnames for OSO Instances
Previously, the OSO broker/node instances would get spawned using a combination of stack name, nova instance name and UUID. This patch allows a user to specify a hostname for broker and node instances. It makes working with broker/node instances much easier from a user's perspective. Change-Id: Ib077acb257e5add6c36b4a913cc6752c716524a7
This commit is contained in:
parent
117650dae9
commit
e499b66b0c
|
@ -38,6 +38,18 @@
|
|||
"Default": "m1.small",
|
||||
"AllowedValues": ["m1.small","m1.medium", "m1.large", "m1.xlarge"]
|
||||
},
|
||||
"BrokerHostname": {
|
||||
"Description": "Hostname of Broker instance",
|
||||
"Type": "String",
|
||||
"Default": "openshift.brokerinstance.novalocal",
|
||||
"MinLength": "1"
|
||||
},
|
||||
"NodeHostname": {
|
||||
"Description": "Hostname of Node instance",
|
||||
"Type": "String",
|
||||
"Default": "openshift.nodeinstance.novalocal",
|
||||
"MinLength": "1"
|
||||
},
|
||||
"Username": {
|
||||
"Description": "Username for accessing OpenShift Origin",
|
||||
"Type": "String",
|
||||
|
@ -187,7 +199,7 @@
|
|||
"export BROKER_WAIT_HANDLE=\"", { "Ref": "BrokerWaitHandle" }, "\"\n",
|
||||
"/usr/sbin/dnssec-keygen -a HMAC-MD5 -b 512 -n USER -r /dev/urandom -K /var/named ${PREFIX}\n",
|
||||
"export DNS_SEC_KEY=\"`cat /var/named/K${PREFIX}.*.key | awk '{print $8}'`\"\n",
|
||||
"export HOSTNAME=\"`facter hostname`\"\n",
|
||||
"export HOSTNAME=", { "Ref": "BrokerHostname"}, "\n",
|
||||
"export USERNAME=", { "Ref": "Username" }, "\n",
|
||||
"export PASSWORD=", { "Ref": "Password" }, "\n",
|
||||
"export DEV_MODE=", { "Ref": "DevMode" }, "\n",
|
||||
|
@ -274,7 +286,7 @@
|
|||
"export UPSTREAM_DNS=", { "Ref": "UpstreamDNS" }, "\n",
|
||||
"export UPSTREAM_NTP=", { "Ref": "UpstreamNTP" }, "\n",
|
||||
"export NODE_WAIT_HANDLE=\"", { "Ref": "NodeWaitHandle" }, "\"\n",
|
||||
"export HOSTNAME=\"`facter hostname`\"\n",
|
||||
"export HOSTNAME=", { "Ref": "NodeHostname"}, "\n",
|
||||
"export DEV_MODE=", { "Ref": "DevMode" }, "\n",
|
||||
"export PUPPET_MODULE_URL=", { "Ref": "PuppetModuleURL" }, "\n",
|
||||
"export PUPPET_MODULE_BRANCH=", { "Ref": "PuppetModuleBranch" }, "\n",
|
||||
|
|
Loading…
Reference in New Issue