Merge "Adding missing setup for instack"

tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html

@@ -49,93 +49,126 @@
 <div class="row-fluid">
   <div class="span8">
     {% blocktrans %}
-      Your cloud is now deployed; however, it needs to be initialized.
+      Your cloud is now deployed; however, it needs to be initialized.  To do so, copy the appropriate script into a file, make it executable, and run it.
     {% endblocktrans %}
     <ul>
       <li>
         {% blocktrans %}
-          For <strong>Devtest</strong> users you can <a data-toggle="collapse" data-target="#devtest">see instructions here</a>.
+          <a data-toggle="collapse" data-target="#devtest"><strong>Devtest</strong> cloud initialization script</a>
         {% endblocktrans %}
         <div id="devtest" class="collapse">
           <pre>
-  # You need to run the following commands from a machine where you have a checkout of the tripleo source code
+#!/usr/bin/bash
-  # and direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
 
-  export TRIPLEO_ROOT=~/tripleo
+# You need to run the following commands from a machine where you have a checkout of the tripleo source code
-  cd $TRIPLEO_ROOT
+# and direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
 
-  # Be careful to source tripleorc here, some variables are rewritten below
+set -eux
-  source $TRIPLEO_ROOT/tripleorc
 
-  export OVERCLOUD_IP={{overcloud.keystone_ip}}
+export TRIPLEO_ROOT=~/tripleo
+cd $TRIPLEO_ROOT
 
-  export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
+# Be careful to source tripleorc here, some variables are rewritten below
-  export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
+source $TRIPLEO_ROOT/tripleorc
-  export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
-  export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
-  export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
-  export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
-  export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
-  export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
-  export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
 
-  OVERCLOUD_ENDPOINT="http://$OVERCLOUD_IP:5000/v2.0"
+export OVERCLOUD_IP={{overcloud.keystone_ip}}
-  NEW_JSON=$(jq '.overcloud.password="'${OVERCLOUD_ADMIN_PASSWORD}'" | .overcloud.endpoint="'${OVERCLOUD_ENDPOINT}'" | .overcloud.endpointhost="'${OVERCLOUD_IP}'"' $TE_DATAFILE)
-  echo $NEW_JSON > $TE_DATAFILE
 
-  source ./tripleo-incubator/overcloudrc
+export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
+export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
+export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
+export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
+export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
+export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
+export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
+export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
+export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
 
-  init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
+OVERCLOUD_ENDPOINT="http://$OVERCLOUD_IP:5000/v2.0"
-      $OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP \
+NEW_JSON=$(jq '.overcloud.password="'${OVERCLOUD_ADMIN_PASSWORD}'" | .overcloud.endpoint="'${OVERCLOUD_ENDPOINT}'" | .overcloud.endpointhost="'${OVERCLOUD_IP}'"' $TE_DATAFILE)
-      ${SSLBASE:+--ssl $PUBLIC_API_URL}
+echo $NEW_JSON &gt; $TE_DATAFILE
-  setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
+
-      --glance-password $OVERCLOUD_GLANCE_PASSWORD \
+source ./tripleo-incubator/overcloudrc
-      --heat-password $OVERCLOUD_HEAT_PASSWORD \
+
-      --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
+init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
-      --nova-password $OVERCLOUD_NOVA_PASSWORD \
+    $OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP \
-      --swift-password $OVERCLOUD_SWIFT_PASSWORD \
+    ${SSLBASE:+--ssl $PUBLIC_API_URL}
-      --enable-horizon \
+setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
-      ${SSLBASE:+--ssl $PUBLIC_API_URL}
+    --glance-password $OVERCLOUD_GLANCE_PASSWORD \
-  keystone role-create --name heat_stack_user
+    --heat-password $OVERCLOUD_HEAT_PASSWORD \
+    --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
+    --nova-password $OVERCLOUD_NOVA_PASSWORD \
+    --swift-password $OVERCLOUD_SWIFT_PASSWORD \
+    --enable-horizon \
+    ${SSLBASE:+--ssl $PUBLIC_API_URL}
+keystone role-create --name heat_stack_user
           </pre>
         </div>
       </li>
       <li>
         {% blocktrans %}
-          For <strong>Instack</strong> users you can <a data-toggle="collapse" data-target="#instack">see instructions here</a>.
+          <a data-toggle="collapse" data-target="#instack"><strong>Instack</strong> cloud initialization script</a>
         {% endblocktrans %}
         <div id="instack" class="collapse">
           <pre>
-  # You need to run the following commands from a Undercloud node where you have
+#!/usr/bin/bash
-  # direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
 
-  # Usually stack user has access to Overcloud control node, so switch to stack user
+set -eux
-  su stack
 
-  export OVERCLOUD_IP={{overcloud.keystone_ip}}
+# You need to run the following commands from a Undercloud node where you have
+# direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
 
-  export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
+# Run these commands as the user you used to install the undercloud, likely the stack
-  export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
+# user if you followed the recommendations from http://openstack.redhat.com/Deploying_RDO_using_Instack.
-  export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
+# The commands should also be run from the home directory of that user.
-  export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
-  export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
-  export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
-  export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
-  export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
-  export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
 
-  source /etc/tripleo/overcloudrc
+# Source your deploy-overcloudrc
+# This file was created when you followed http://openstack.redhat.com/Deploying_an_RDO_Overcloud_with_Instack
+source deploy-overcloudrc
 
-  tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
+export OVERCLOUD_IP={{overcloud.keystone_ip}}
-      $OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP
+
-  tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
+cat &gt; tripleo-overcloud-passwords &lt;&lt;EOF
-      --glance-password $OVERCLOUD_GLANCE_PASSWORD \
+export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
-      --heat-password $OVERCLOUD_HEAT_PASSWORD \
+export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
-      --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
+export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
-      --nova-password $OVERCLOUD_NOVA_PASSWORD \
+export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
-      --swift-password $OVERCLOUD_SWIFT_PASSWORD \
+export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
-      --enable-horizon
+export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
-  keystone role-create --name heat_stack_user
+export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
+export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
+export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
+EOF
+
+source tripleo-overcloud-passwords
+
+JSONFILE=nodes.json
+if [ ! -f $JSONFILE ]; then
+  echo '{}' &gt; $JSONFILE
+fi
+OVERCLOUD_ENDPOINT="http://{{overcloud.keystone_ip}}:5000/v2.0"
+NEW_JSON=$(jq '.overcloud.password="'{{overcloud.attributes.AdminPassword}}'" | .overcloud.endpoint="'${OVERCLOUD_ENDPOINT}'" | .overcloud.endpointhost="'{{overcloud.keystone_ip}}'"' $JSONFILE)
+echo $NEW_JSON &gt; $JSONFILE
+export TE_DATAFILE=$JSONFILE
+
+source /etc/tripleo/overcloudrc
+
+tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
+    $OVERCLOUD_IP admin@example.com heat-admin@$OVERCLOUD_IP
+tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
+    --glance-password $OVERCLOUD_GLANCE_PASSWORD \
+    --heat-password $OVERCLOUD_HEAT_PASSWORD \
+    --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
+    --nova-password $OVERCLOUD_NOVA_PASSWORD \
+    --swift-password $OVERCLOUD_SWIFT_PASSWORD \
+    --enable-horizon
+keystone role-create --name heat_stack_user
+
+# Setup the neutron
+tripleo setup-neutron "" "" $NETWORK_CIDR "" "" "" $FLOATING_IP_START $FLOATING_IP_END $FLOATING_IP_CIDR
+
+# Workaround https://bugs.launchpad.net/diskimage-builder/+bug/1211165
+nova flavor-delete m1.tiny
+nova flavor-create m1.tiny 1 512 2 1
           </pre>
         </div>
       </li>