diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-12-03 16:44:33 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-22 12:46:26 +0000 |
| commit | 822ce87fcb92f5034a3f52b956741ba2fbeef86b (patch) | |
| tree | 1028e1f9bebd3468300ed55ec43f6b0579ff43b1 | |
| parent | 4ea859f8221d06e87e302a3b2fc2c62a7a8ff821 (diff) | |
| download | definitions-822ce87fcb92f5034a3f52b956741ba2fbeef86b.tar.gz | |
FIXUPME: Move replacement of KEYSTONE_TEMPORARY_ADMIN_TOKEN to openstack-keystone.configure
| -rw-r--r-- | openstack-cinder.configure | 1 | ||||
| -rw-r--r-- | openstack-glance.configure | 1 | ||||
| -rw-r--r-- | openstack-keystone.configure | 6 | ||||
| -rw-r--r-- | openstack-nova-compute.configure | 1 | ||||
| -rw-r--r-- | openstack-nova.configure | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/openstack-cinder.configure b/openstack-cinder.configure index ec2dd4b8..5688ee72 100644 --- a/openstack-cinder.configure +++ b/openstack-cinder.configure @@ -24,7 +24,6 @@ ROOT="$1" ########################################################################## cat <<EOF > "$ROOT"/etc/openstack-cinder-setup.sed -s/##KEYSTONE_TEMPORARY_ADMIN_TOKEN##/$KEYSTONE_TEMPORARY_ADMIN_TOKEN/g s/##CINDER_USER##/$CINDER_USER/g s/##CINDER_PASSWORD##/$CINDER_PASSWORD/g s/##CINDER_PUBLIC_URL##/$CINDER_PUBLIC_URL/g diff --git a/openstack-glance.configure b/openstack-glance.configure index c99d4fd0..a94de93a 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -24,7 +24,6 @@ ROOT="$1" ########################################################################## cat <<EOF > "$ROOT"/etc/openstack-glance-setup.sed -s/##KEYSTONE_TEMPORARY_ADMIN_TOKEN##/$KEYSTONE_TEMPORARY_ADMIN_TOKEN/g s/##GLANCE_SERVICE_USER##/$GLANCE_SERVICE_USER/g s/##GLANCE_SERVICE_PASSWORD##/$GLANCE_SERVICE_PASSWORD/g s/##GLANCE_PUBLIC_URL##/$GLANCE_PUBLIC_URL/g diff --git a/openstack-keystone.configure b/openstack-keystone.configure index e4749503..2d27ddbc 100644 --- a/openstack-keystone.configure +++ b/openstack-keystone.configure @@ -39,7 +39,11 @@ sed -f "$ROOT"/etc/openstack-keystone-setup.sed -i \ "$ROOT"/etc/glance/glance-registry.conf \ "$ROOT"/etc/nova/nova.conf \ "$ROOT"/etc/cinder/cinder.conf \ - "$ROOT"/usr/share/openstack/openstack-keystone-setup + "$ROOT"/usr/share/openstack/openstack-keystone-setup \ + "$ROOT"/usr/share/openstack/openstack-glance-setup \ + "$ROOT"/usr/share/openstack/openstack-nova-setup \ + "$ROOT"/usr/share/openstack/openstack-neutron-setup \ + "$ROOT"/usr/share/openstack/openstack-cinder-setup ########################################################################## diff --git a/openstack-nova-compute.configure b/openstack-nova-compute.configure index 4fd9bb1e..9487c759 100644 --- a/openstack-nova-compute.configure +++ b/openstack-nova-compute.configure @@ -24,7 +24,6 @@ ROOT="$1" ########################################################################## cat <<EOF > "$ROOT"/etc/openstack-nova-compute-setup.sed -s/##KEYSTONE_TEMPORARY_ADMIN_TOKEN##/$KEYSTONE_TEMPORARY_ADMIN_TOKEN/g s/##NOVA_SERVICE_USER##/$NOVA_SERVICE_USER/g s/##NOVA_SERVICE_PASSWORD##/$NOVA_SERVICE_PASSWORD/g s/##NOVA_PUBLIC_URL##/$NOVA_PUBLIC_URL/g diff --git a/openstack-nova.configure b/openstack-nova.configure index de18beb0..0cda3311 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -24,7 +24,6 @@ ROOT="$1" ########################################################################## cat <<EOF > "$ROOT"/etc/openstack-nova-setup.sed -s/##KEYSTONE_TEMPORARY_ADMIN_TOKEN##/$KEYSTONE_TEMPORARY_ADMIN_TOKEN/g s/##NOVA_SERVICE_USER##/$NOVA_SERVICE_USER/g s/##NOVA_SERVICE_PASSWORD##/$NOVA_SERVICE_PASSWORD/g s/##NOVA_PUBLIC_URL##/$NOVA_PUBLIC_URL/g |