diff --git a/hot/software-config/boot-config/README.rst b/hot/software-config/boot-config/README.rst index e780012c..0789de90 100644 --- a/hot/software-config/boot-config/README.rst +++ b/hot/software-config/boot-config/README.rst @@ -27,8 +27,8 @@ To install the agent during boot, include the following in the template: When creating the stack, reference the desired environment, eg: - heat stack-create -e fedora_yum_env.yaml \ - -f ../example-templates/example-config-pristine-image.yaml \ + openstack stack create -e fedora_yum_env.yaml \ + -t ../example-templates/example-config-pristine-image.yaml \ deploy-to-pristine ===================================== @@ -50,6 +50,6 @@ include the following in the template: and reference the desired environment, eg: - heat stack-create -e container_agent_env.yaml \ - -f ../example-templates/example-pristine-atomic-docker-compose.yaml \ + openstack stack create -e container_agent_env.yaml \ + -t ../example-templates/example-pristine-atomic-docker-compose.yaml \ deploy-to-pristine diff --git a/hot/software-config/elements/README.rst b/hot/software-config/elements/README.rst index 2833f15e..db803406 100644 --- a/hot/software-config/elements/README.rst +++ b/hot/software-config/elements/README.rst @@ -42,5 +42,5 @@ with the following: heat-config-salt \ heat-config-script \ -o fedora-software-config.qcow2 - glance image-create --disk-format qcow2 --container-format bare --name fedora-software-config < \ + openstack image create --disk-format qcow2 --container-format bare fedora-software-config < \ fedora-software-config.qcow2 diff --git a/hot/software-config/elements/heat-config-docker-compose/README.rst b/hot/software-config/elements/heat-config-docker-compose/README.rst index b77ea116..1aab2522 100644 --- a/hot/software-config/elements/heat-config-docker-compose/README.rst +++ b/hot/software-config/elements/heat-config-docker-compose/README.rst @@ -7,10 +7,12 @@ if env_file keys specified in the `docker-compose.yml`, do not exist in input_values supplied, docker-compose will throw an error, as it can't find these files. -Also, `-Pf` option can be used to pass env files from client. +Also, `--parameter-file` option can be used to pass env files from client. Example: -$ heat stack-create test_stack -f example-docker-compose-template.yaml \ - -Pf env_file_0=./common.env -Pf env_file_1=./apps/web.env \ - -Pf env_file_2=./test.env -Pf env_file_3=./busybox.env \ No newline at end of file +$ openstack stack create test_stack -t example-docker-compose-template.yaml \ + --parameter-file env_file_0=./common.env \ + --parameter-file env_file_1=./apps/web.env \ + --parameter-file env_file_2=./test.env \ + --parameter-file env_file_3=./busybox.env \ No newline at end of file diff --git a/hot/software-config/example-templates/cirros-example/README.rst b/hot/software-config/example-templates/cirros-example/README.rst index 2463c846..e2bbc34d 100644 --- a/hot/software-config/example-templates/cirros-example/README.rst +++ b/hot/software-config/example-templates/cirros-example/README.rst @@ -14,8 +14,8 @@ modified image to glance: 1. wget http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img 2. virt-copy-in -a cirros-0.3.2-x86_64-disk.img init.d/heat-deploy-hook /etc/init.d 3. virt-copy-in -a cirros-0.3.2-x86_64-disk.img rc3.d/S99-heat-deploy-hook /etc/rc3.d -4. glance image-create --name cirros-0.3.2-sc --disk-format=qcow2 --container-format=bare < cirros-0.3.2-x86_64-disk.img -5. heat stack-create sc1 -f cirros-hello-world.yaml -P "image=cirros-0.3.2-sc" +4. openstack image create cirros-0.3.2-sc --disk-format=qcow2 --container-format=bare < cirros-0.3.2-x86_64-disk.img +5. openstack stack create sc1 -t cirros-hello-world.yaml --parameter "image=cirros-0.3.2-sc" *NOTE*: The hook script is very basic and has a number of TODO items related to security and functionality - please don't use it for "real" deployments, it's diff --git a/hot/software-config/example-templates/example-deploy-sequence.yaml b/hot/software-config/example-templates/example-deploy-sequence.yaml index 57e03099..e03b469d 100644 --- a/hot/software-config/example-templates/example-deploy-sequence.yaml +++ b/hot/software-config/example-templates/example-deploy-sequence.yaml @@ -20,8 +20,8 @@ heat_template_version: 2013-05-23 # How to deploy the sample: # # 1. Create on image with element heat-config-script in -# 2. heat stack-create -f example-deploy-sequence.yaml sequence -# 3. heat stack-show sequence +# 2. openstack stack create -t example-deploy-sequence.yaml sequence +# 3. openstack stack show sequence ################################################################### parameters: key_name: diff --git a/openshift-origin/F19/README.rst b/openshift-origin/F19/README.rst index 751e3438..6b02b1b9 100644 --- a/openshift-origin/F19/README.rst +++ b/openshift-origin/F19/README.rst @@ -30,7 +30,7 @@ To build with diskimage-builder, do the following in the parent directory of hea export TMP_DIR=$HOME/tmp export DIB_IMAGE_SIZE=5 diskimage-builder/bin/disk-image-create --no-tmpfs -a amd64 vm fedora openshift-origin-broker -o F19-x86_64-openshift-origin-broker - glance image-create --name F19-x86_64-openshift-origin-broker --is-public true --disk-format qcow2 --container-format bare < F19-x86_64-openshift-origin-broker.qcow2 + openstack image create F19-x86_64-openshift-origin-broker --public true --disk-format qcow2 --container-format bare < F19-x86_64-openshift-origin-broker.qcow2 export DIB_IMAGE_SIZE=20 diskimage-builder/bin/disk-image-create --no-tmpfs -a amd64 vm fedora openshift-origin-node -o F19-x86_64-openshift-origin-node - glance image-create --name F19-x86_64-openshift-origin-node --is-public true --disk-format qcow2 --container-format bare < F19-x86_64-openshift-origin-node.qcow2 + openstack image create F19-x86_64-openshift-origin-node --public true --disk-format qcow2 --container-format bare < F19-x86_64-openshift-origin-node.qcow2 diff --git a/openshift-origin/centos65/highly-available/README.md b/openshift-origin/centos65/highly-available/README.md index f8937a11..f4f72632 100644 --- a/openshift-origin/centos65/highly-available/README.md +++ b/openshift-origin/centos65/highly-available/README.md @@ -62,13 +62,13 @@ These templates are [Heat Orchestration Templates (HOT)](http://docs.openstack.o 3. Edit heat environment file `oso_ha_env.yaml` according to your environment. 4. Launch highly available OpenShift stack - heat stack-create openshift-ha-stack -f oso_ha_stack.yaml -e oso_ha_env.yaml + openstack stack create openshift-ha-stack -t oso_ha_stack.yaml -e oso_ha_env.yaml 5. Monitor progress. Options include: * `tail -f /var/log/heat/heat-engine.log` * `tail -f /tmp/openshift.out` - * `heat stack-list` - * `heat resource-list openshift-ha-stack` + * `openstack stack list` + * `openstack stack resource list openshift-ha-stack` ## Scaling: Adding Nodes @@ -77,7 +77,7 @@ OpenShift nodes may be manually added as needed using the OpenShift node heat te 1. From directory `heat-templates/openshift-origin/centos65/highly-available/` edit the heat environment file `oso_node_env.yaml` 2. Launch node stack. This will deploy a single node server with attached cinder volume and floating IP address. Be sure to pass in the node hostname parameter to override the default. - heat stack-create openshift-node -f oso_node_stack.yaml -e oso_node_env.yaml -P "node_hostname=node4" + openstack stack create openshift-node -t oso_node_stack.yaml -e oso_node_env.yaml --parameter "node_hostname=node4" 3. On broker1 add a DNS record for the new node server in `/var/named/dynamic/.db`. To force a zone transfer to the upstream DNS increment the serial number by 1 and run `rndc freeze ; rndc thaw`. diff --git a/openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml b/openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml index cbd874bf..07f5bb04 100644 --- a/openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml +++ b/openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml @@ -15,7 +15,7 @@ parameters: mcollective_pass: password mongo_broker_pass: password openshift_pass1: password - # Use 'neutron net-list' and 'neutron subnet-list' and replace these values + # Use 'openstack network list' and 'openstack subnet list' and replace these values private_net_id: ec6c8237-1368-42c2-af6a-2c5a6b41951b public_net_id: c5882794-fa7d-46b2-b90a-e37e47fabdf8 private_subnet_id: 8977e24c-32c6-4fb1-ae9f-6f70c16ecf0d