Merge "Fix path in readme for DIB"

This commit is contained in:
Jenkins 2016-09-20 19:57:39 +00:00 committed by Gerrit Code Review
commit a3b37ee299
2 changed files with 5 additions and 6 deletions

View File

@ -37,7 +37,7 @@ To build Debian-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/DockerStandaloneHost/elements \
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${k8s-docker-suite-app-murano}/DockerStandaloneHost/elements \
DIB_RELEASE=jessie DIB_CLOUD_INIT_DATASOURCES="Ec2, ConfigDrive, OpenStack" disk-image-create vm debian murano-agent-debian \
docker -o debian8-x64-docker
@ -45,7 +45,7 @@ To build Ubuntu-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/DockerStandaloneHost/elements disk-image-create \
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${k8s-docker-suite-app-murano}/DockerStandaloneHost/elements disk-image-create \
vm ubuntu murano-agent docker -o ubuntu14.04-x64-docker
Where ${murano_agent_root} is a path to murano-agent files

View File

@ -37,16 +37,15 @@ To build Debian-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/Kubernetes/KubernetesCluster/elements \
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:{k8s-docker-suite-app-murano}/Kubernetes/KubernetesCluster/elements \
DIB_RELEASE=jessie DIB_CLOUD_INIT_DATASOURCES="Ec2, ConfigDrive, OpenStack" disk-image-create vm debian murano-agent-debian \
docker kubernetes -o debian8-x64-kubernetes
To build Ubuntu-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/Kubernetes/KubernetesCluster/elements disk-image-create \
vm ubuntu murano-agent docker kubernetes -o ubuntu14.04-x64-kubernetes
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:{k8s-docker-suite-app-murano}/Kubernetes/KubernetesCluster/elements disk-image-create \
vm ubuntu murano-agent docker kubernetes -o ubuntu14.04-x64-kubernetes
Where ${murano_agent_root} is a path to murano-agent files
and ${murano_apps_root} is a path to murano-apps files.