summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Hallisey <rhallise@redhat.com>2015-11-10 13:28:30 -0500
committerRyan Hallisey <rhallise@redhat.com>2015-11-10 13:28:30 -0500
commit266d123286e91bb733102ae20f607caeead520f2 (patch)
tree092ce87a8b098e21e9175beda20fed8ae1c42352
parent74c22572c770459802d93b47c17414e4507413e1 (diff)
Change the Atomic image name so it's less specific
The atomic image name in glance was being set to 'fedora-atomic'. The glance image can be any form of atomic distro so we shouldn't name this specifically 'fedora-atomic', but instead 'atomic-image'. Change-Id: Ic539b82b92e3fdd834750e591d8622b7dc85fc6d
-rw-r--r--docker/README-containers.md2
-rw-r--r--environments/docker-rdo.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/README-containers.md b/docker/README-containers.md
index 0e67c183..17990b54 100644
--- a/docker/README-containers.md
+++ b/docker/README-containers.md
@@ -12,7 +12,7 @@ Download the fedora atomic image into glance:
```
wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2
-glance image-create --name fedora-atomic --file Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2 --disk-format qcow2 --container-format bare
+glance image-create --name atomic-image --file Fedora-Cloud-Atomic-22-20150521.x86_64.qcow2 --disk-format qcow2 --container-format bare
```
## Configuring TripleO
diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index d5791369..8a6e1018 100644
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -5,7 +5,7 @@ resource_registry:
OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
parameters:
- NovaImage: fedora-atomic
+ NovaImage: atomic-image
parameter_defaults:
DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty