diff --git a/install.sh b/install.sh index c23d79ad72..8334aa7736 100755 --- a/install.sh +++ b/install.sh @@ -736,7 +736,7 @@ INSTALL_ONEPROVISION_FILES=( ONEPROVISION_ONE_LIB_FILES:$LIB_LOCATION/ruby/cli/one_helper ONEPROVISION_CONF_FILES:$ETC_LOCATION/cli ONEPROVISION_ANSIBLE_FILES:$SHARE_LOCATION/oneprovision - ONEPROVISION_TEMPLATES_FILES:$SHARE_LOCATION/oneprovision + ONEPROVISION_TEMPLATES_FILES:$SHARE_LOCATION/oneprovision/provisions ONEPROVISION_LIB_FILES:$LIB_LOCATION/oneprovision/lib ONEPROVISION_LIB_TF_FILES:$LIB_LOCATION/oneprovision/lib/terraform ONEPROVISION_LIB_PROVIDERS_FILES:$LIB_LOCATION/oneprovision/lib/terraform/providers @@ -2377,7 +2377,7 @@ ONEPROVISION_CONF_FILES="src/cli/etc/oneprovision.yaml \ ONEPROVISION_ANSIBLE_FILES="share/oneprovision/ansible" -ONEPROVISION_TEMPLATES_FILES="share/oneprovision/hybrid+" +ONEPROVISION_TEMPLATES_FILES="share/oneprovision/provisions/hybrid+" ONEPROVISION_LIB_FILES="src/oneprovision/lib/oneprovision.rb \ src/oneprovision/lib/provision_element.rb" diff --git a/share/oneprovision/hybrid+/description.txt b/share/oneprovision/provisions/hybrid+/description.txt similarity index 100% rename from share/oneprovision/hybrid+/description.txt rename to share/oneprovision/provisions/hybrid+/description.txt diff --git a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml similarity index 100% rename from share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml rename to share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml diff --git a/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml similarity index 100% rename from share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml rename to share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml diff --git a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml b/share/oneprovision/provisions/hybrid+/providers/packet/packet-amsterdam.yml similarity index 100% rename from share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml rename to share/oneprovision/provisions/hybrid+/providers/packet/packet-amsterdam.yml diff --git a/share/oneprovision/hybrid+/provisions/aws.d/datastores.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.d/datastores.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/aws.d/datastores.yml rename to share/oneprovision/provisions/hybrid+/provisions/aws.d/datastores.yml diff --git a/share/oneprovision/hybrid+/provisions/aws.d/defaults.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.d/defaults.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/aws.d/defaults.yml rename to share/oneprovision/provisions/hybrid+/provisions/aws.d/defaults.yml diff --git a/share/oneprovision/hybrid+/provisions/aws.d/inputs.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.d/inputs.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/aws.d/inputs.yml rename to share/oneprovision/provisions/hybrid+/provisions/aws.d/inputs.yml diff --git a/share/oneprovision/hybrid+/provisions/aws.d/networks.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.d/networks.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/aws.d/networks.yml rename to share/oneprovision/provisions/hybrid+/provisions/aws.d/networks.yml diff --git a/share/oneprovision/hybrid+/provisions/aws.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/aws.yml rename to share/oneprovision/provisions/hybrid+/provisions/aws.yml diff --git a/share/oneprovision/hybrid+/provisions/common.d/defaults.yml b/share/oneprovision/provisions/hybrid+/provisions/common.d/defaults.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/common.d/defaults.yml rename to share/oneprovision/provisions/hybrid+/provisions/common.d/defaults.yml diff --git a/share/oneprovision/hybrid+/provisions/common.d/kvm_hosts.yml b/share/oneprovision/provisions/hybrid+/provisions/common.d/kvm_hosts.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/common.d/kvm_hosts.yml rename to share/oneprovision/provisions/hybrid+/provisions/common.d/kvm_hosts.yml diff --git a/share/oneprovision/hybrid+/provisions/common.d/resources.yml b/share/oneprovision/provisions/hybrid+/provisions/common.d/resources.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/common.d/resources.yml rename to share/oneprovision/provisions/hybrid+/provisions/common.d/resources.yml diff --git a/share/oneprovision/hybrid+/provisions/packet.d/datastores.yml b/share/oneprovision/provisions/hybrid+/provisions/packet.d/datastores.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/packet.d/datastores.yml rename to share/oneprovision/provisions/hybrid+/provisions/packet.d/datastores.yml diff --git a/share/oneprovision/hybrid+/provisions/packet.d/defaults.yml b/share/oneprovision/provisions/hybrid+/provisions/packet.d/defaults.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/packet.d/defaults.yml rename to share/oneprovision/provisions/hybrid+/provisions/packet.d/defaults.yml diff --git a/share/oneprovision/hybrid+/provisions/packet.d/inputs.yml b/share/oneprovision/provisions/hybrid+/provisions/packet.d/inputs.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/packet.d/inputs.yml rename to share/oneprovision/provisions/hybrid+/provisions/packet.d/inputs.yml diff --git a/share/oneprovision/hybrid+/provisions/packet.d/networks.yml b/share/oneprovision/provisions/hybrid+/provisions/packet.d/networks.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/packet.d/networks.yml rename to share/oneprovision/provisions/hybrid+/provisions/packet.d/networks.yml diff --git a/share/oneprovision/hybrid+/provisions/packet.yml b/share/oneprovision/provisions/hybrid+/provisions/packet.yml similarity index 100% rename from share/oneprovision/hybrid+/provisions/packet.yml rename to share/oneprovision/provisions/hybrid+/provisions/packet.yml